From e9fcfbefd902dde31e8b21edab1ebc01838f81c2 Mon Sep 17 00:00:00 2001
From: otsmr <git@tsmr.eu>
Date: Wed, 14 Jan 2026 23:12:48 +0100
Subject: [PATCH] fixed some small issues

---
 lib/src/views/components/animate_icon.dart    | 390 +++++++++---------
 .../subscription/subscription.view.dart       |   9 +-
 2 files changed, 200 insertions(+), 199 deletions(-)

diff --git a/lib/src/views/components/animate_icon.dart b/lib/src/views/components/animate_icon.dart
index a56c511..28f6462 100644
--- a/lib/src/views/components/animate_icon.dart
+++ b/lib/src/views/components/animate_icon.dart
@@ -26,202 +26,202 @@ class EmojiAnimation extends StatelessWidget {
   final String emoji;
   final bool repeat;
   static final Map<String, String> animatedIcons = {
-    "❤": "red_heart.json",
-    "😂": "joy.json",
-    "🔥": "fire.json",
-    "💪": "muscle.json",
-    "😭": "loudly-crying.json",
-    "🤯": "mind-blown.json",
-    "❤️‍🔥": "red_heart_fire.json",
+    '❤': 'red_heart.json',
+    '😂': 'joy.json',
+    '🔥': 'fire.json',
+    '💪': 'muscle.json',
+    '😭': 'loudly-crying.json',
+    '🤯': 'mind-blown.json',
+    '❤️‍🔥': 'red_heart_fire.json',
     // "😁": "grinning.json",
-    "😆": "laughing.json",
-    "😅": "grin-sweat.json",
-    "🤣": "rofl.json",
-    "😉": "wink.json",
-    "😙": "kissing-smiling-eyes.json",
-    "😘": "kissing-heart.json",
-    "🥰": "heart-face.json",
-    "😍": "heart-eyes.json",
-    "🤩": "star-struck.json",
-    "🥳": "partying-face.json",
-    "🙃": "upside-down-face.json",
-    "🥲": "happy-cry.json",
-    "😊": "blush.json",
-    "😏": "smirk.json",
-    "🤤": "drool.json",
-    "😋": "yum.json",
-    "😛": "stuck-out-tongue.json",
-    "🤪": "zany-face.json",
-    "🥴": "woozy.json",
-    "😔": "pensive.json",
-    "🥺": "pleading.json",
-    "😬": "grimacing.json",
-    "😑": "expressionless.json",
-    "😐": "neutral-face.json",
-    "🤐": "zipper-face.json",
-    "🤔": "thinking-face.json",
-    "🥱": "yawn.json",
-    "🤗": "hug-face.json",
-    "😱": "screaming.json",
-    "🤨": "raised-eyebrow.json",
-    "🧐": "monocle.json",
-    "😒": "unamused.json",
-    "🙄": "rolling-eyes.json",
-    "😤": "triumph.json",
-    "🤬": "cursing.json",
-    "😞": "sad.json",
-    "😢": "cry.json",
-    "🙁": "frown.json",
-    "😨": "scared.json",
-    "😳": "flushed.json",
-    "😖": "scrunched-mouth.json",
-    "😵": "x-eyes.json",
-    "🥶": "cold-face.json",
-    "🥵": "hot-face.json",
-    "🤮": "vomit.json",
-    "😴": "sleep.json",
-    "🤒": "thermometer-face.json",
-    "🤕": "bandage-face.json",
-    "🤥": "liar.json",
-    "😇": "halo.json",
-    "🤠": "cowboy.json",
-    "🤑": "money-face.json",
-    "🤓": "nerd-face.json",
-    "😎": "sunglasses-face.json",
-    "🥸": "disguise.json",
-    "🤡": "clown.json",
-    "💩": "poop.json",
-    "😈": "imp-smile.json",
-    "👻": "ghost.json",
-    "💀": "skull.json",
-    "⛄": "snowman.json",
-    "🎃": "jack-o-lantern.json",
-    "🤖": "robot.json",
-    "👽": "alien.json",
-    "😺": "smiley-cat.json",
-    "😸": "smile-cat.json",
-    "😹": "joy-cat.json",
-    "😻": "heart-eyes-cat.json",
-    "😼": "smirk-cat.json",
-    "😽": "kissing-cat.json",
-    "🙀": "scream-cat.json",
-    "😿": "crying-cat-face.json",
-    "😾": "pouting-cat.json",
-    "🙈": "see-no-evil-monkey.json",
-    "🙉": "hear-no-evil-monkey.json",
-    "🙊": "speak-no-evil-monkey.json",
-    "🌟": "glowing-star.json",
-    "✨": "sparkles.json",
-    "⚡": "electricity.json",
-    "💥": "collision.json",
-    "💯": "100.json",
-    "🎉": "party-popper.json",
-    "🎊": "confetti-ball.json",
-    "🧡": "orange-heart.json",
-    "💛": "yellow-heart.json",
-    "💚": "green-heart.json",
-    "💙": "blue-heart.json",
-    "💜": "purple-heart.json",
-    "💘": "cupid.json",
-    "💝": "gift-heart.json",
-    "💖": "sparkling-heart.json",
-    "💗": "heart-grow.json",
-    "💓": "beating-heart.json",
-    "💞": "revolving-hearts.json",
-    "💕": "two-hearts.json",
-    "💔": "broken-heart.json",
-    "💋": "kiss.json",
-    "👀": "eyes.json",
-    "🦻": "hearing-aid.json",
-    "🦶": "foot.json",
-    "🦵": "leg.json",
-    "🦿": "leg-mechanical.json",
-    "🦾": "arm-mechanical.json",
-    "👏": "clap.json",
-    "👍": "thumbs-up.json",
-    "👎": "thumbs-down.json",
-    "🙌": "raising-hands.json",
-    "🤲": "palms-up.json",
-    "✊": "raised-fist.json",
-    "👊": "fist.json",
-    "👋": "wave.json",
-    "🤘": "metal.json",
-    "🤞": "crossed-fingers.json",
-    "🤙": "call-me-hand.json",
-    "👌": "ok.json",
-    "🖕": "middle-finger.json",
-    "🤝": "handshake.json",
-    "💃": "dancer-woman.json",
-    "🌱": "plant.json",
-    "🍃": "leaves.json",
-    "🍀": "luck.json",
-    "🌋": "volcano.json",
-    "🌈": "rainbow.json",
-    "🌊": "ocean.json",
-    "💧": "droplet.json",
-    "🦄": "unicorn.json",
-    "🦎": "lizard.json",
-    "🦖": "t-rex.json",
-    "🦕": "dinosaur.json",
-    "🐢": "turtle.json",
-    "🐊": "crocodile.json",
-    "🐍": "snake.json",
-    "🐩": "poodle.json",
-    "🐕": "dog.json",
-    "🦮": "guide-dog.json",
-    "🐖": "pig.json",
-    "🦘": "kangaroo.json",
-    "🐅": "tiger.json",
-    "🐒": "monkey.json",
-    "🦍": "gorilla.json",
-    "🦧": "orangutan.json",
-    "🦦": "otter.json",
-    "🐓": "rooster.json",
-    "🦅": "eagle.json",
-    "🦉": "owl.json",
-    "🦚": "peacock.json",
-    "🦭": "seal.json",
-    "🦈": "shark.json",
-    "🐬": "dolphin.json",
-    "🐳": "whale.json",
-    "🐟": "fish.json",
-    "🐡": "blowfish.json",
-    "🦞": "lobster.json",
-    "🦀": "crab.json",
-    "🐙": "octopus.json",
-    "🦂": "scorpion.json",
-    "🐌": "snail.json",
-    "🐜": "ant.json",
-    "🪳": "cockroach.json",
-    "🪰": "fly.json",
-    "🐝": "bee.json",
-    "🐞": "lady-bug.json",
-    "🌯": "burrito.json",
-    "🍻": "clinking-beer-mugs.json",
-    "🍾": "bottle-with-popping-cork.json",
-    "🚨": "police-car-light.json",
-    "🚗": "automobile.json",
-    "🚕": "taxi.json",
-    "🛸": "flying-saucer.json",
-    "🚀": "rocket.json",
-    "🛫": "airplane-departure.json",
-    "🎢": "roller-coaster.json",
-    "🎡": "ferris-wheel.json",
-    "🎈": "balloon.json",
-    "🎁": "wrapped-gift.json",
-    "🎆": "fireworks.json",
-    "💸": "money-with-wings.json",
-    "💎": "gem-stone.json",
-    "🎓": "graduation-cap.json",
-    "⏰": "alarm-clock.json",
-    "🔔": "bell.json",
-    "💣": "bomb.json",
-    "❗": "exclamation.json",
-    "❓": "question.json",
-    "❌": "cross-mark.json",
-    "🏁": "chequered-flag.json",
-    "🚩": "triangular-flag.json",
-    "🏴": "black-flag.json",
+    '😆': 'laughing.json',
+    '😅': 'grin-sweat.json',
+    '🤣': 'rofl.json',
+    '😉': 'wink.json',
+    '😙': 'kissing-smiling-eyes.json',
+    '😘': 'kissing-heart.json',
+    '🥰': 'heart-face.json',
+    '😍': 'heart-eyes.json',
+    '🤩': 'star-struck.json',
+    '🥳': 'partying-face.json',
+    '🙃': 'upside-down-face.json',
+    '🥲': 'happy-cry.json',
+    '😊': 'blush.json',
+    '😏': 'smirk.json',
+    '🤤': 'drool.json',
+    '😋': 'yum.json',
+    '😛': 'stuck-out-tongue.json',
+    '🤪': 'zany-face.json',
+    '🥴': 'woozy.json',
+    '😔': 'pensive.json',
+    '🥺': 'pleading.json',
+    '😬': 'grimacing.json',
+    '😑': 'expressionless.json',
+    '😐': 'neutral-face.json',
+    '🤐': 'zipper-face.json',
+    '🤔': 'thinking-face.json',
+    '🥱': 'yawn.json',
+    '🤗': 'hug-face.json',
+    '😱': 'screaming.json',
+    '🤨': 'raised-eyebrow.json',
+    '🧐': 'monocle.json',
+    '😒': 'unamused.json',
+    '🙄': 'rolling-eyes.json',
+    '😤': 'triumph.json',
+    '🤬': 'cursing.json',
+    '😞': 'sad.json',
+    '😢': 'cry.json',
+    '🙁': 'frown.json',
+    '😨': 'scared.json',
+    '😳': 'flushed.json',
+    '😖': 'scrunched-mouth.json',
+    '😵': 'x-eyes.json',
+    '🥶': 'cold-face.json',
+    '🥵': 'hot-face.json',
+    '🤮': 'vomit.json',
+    '😴': 'sleep.json',
+    '🤒': 'thermometer-face.json',
+    '🤕': 'bandage-face.json',
+    '🤥': 'liar.json',
+    '😇': 'halo.json',
+    '🤠': 'cowboy.json',
+    '🤑': 'money-face.json',
+    '🤓': 'nerd-face.json',
+    '😎': 'sunglasses-face.json',
+    '🥸': 'disguise.json',
+    '🤡': 'clown.json',
+    '💩': 'poop.json',
+    '😈': 'imp-smile.json',
+    '👻': 'ghost.json',
+    '💀': 'skull.json',
+    '⛄': 'snowman.json',
+    '🎃': 'jack-o-lantern.json',
+    '🤖': 'robot.json',
+    '👽': 'alien.json',
+    '😺': 'smiley-cat.json',
+    '😸': 'smile-cat.json',
+    '😹': 'joy-cat.json',
+    '😻': 'heart-eyes-cat.json',
+    '😼': 'smirk-cat.json',
+    '😽': 'kissing-cat.json',
+    '🙀': 'scream-cat.json',
+    '😿': 'crying-cat-face.json',
+    '😾': 'pouting-cat.json',
+    '🙈': 'see-no-evil-monkey.json',
+    '🙉': 'hear-no-evil-monkey.json',
+    '🙊': 'speak-no-evil-monkey.json',
+    '🌟': 'glowing-star.json',
+    '✨': 'sparkles.json',
+    '⚡': 'electricity.json',
+    '💥': 'collision.json',
+    '💯': '100.json',
+    '🎉': 'party-popper.json',
+    '🎊': 'confetti-ball.json',
+    '🧡': 'orange-heart.json',
+    '💛': 'yellow-heart.json',
+    '💚': 'green-heart.json',
+    '💙': 'blue-heart.json',
+    '💜': 'purple-heart.json',
+    '💘': 'cupid.json',
+    '💝': 'gift-heart.json',
+    '💖': 'sparkling-heart.json',
+    '💗': 'heart-grow.json',
+    '💓': 'beating-heart.json',
+    '💞': 'revolving-hearts.json',
+    '💕': 'two-hearts.json',
+    '💔': 'broken-heart.json',
+    '💋': 'kiss.json',
+    '👀': 'eyes.json',
+    '🦻': 'hearing-aid.json',
+    '🦶': 'foot.json',
+    '🦵': 'leg.json',
+    '🦿': 'leg-mechanical.json',
+    '🦾': 'arm-mechanical.json',
+    '👏': 'clap.json',
+    '👍': 'thumbs-up.json',
+    '👎': 'thumbs-down.json',
+    '🙌': 'raising-hands.json',
+    '🤲': 'palms-up.json',
+    '✊': 'raised-fist.json',
+    '👊': 'fist.json',
+    '👋': 'wave.json',
+    '🤘': 'metal.json',
+    '🤞': 'crossed-fingers.json',
+    '🤙': 'call-me-hand.json',
+    '👌': 'ok.json',
+    '🖕': 'middle-finger.json',
+    '🤝': 'handshake.json',
+    '💃': 'dancer-woman.json',
+    '🌱': 'plant.json',
+    '🍃': 'leaves.json',
+    '🍀': 'luck.json',
+    '🌋': 'volcano.json',
+    '🌈': 'rainbow.json',
+    '🌊': 'ocean.json',
+    '💧': 'droplet.json',
+    '🦄': 'unicorn.json',
+    '🦎': 'lizard.json',
+    '🦖': 't-rex.json',
+    '🦕': 'dinosaur.json',
+    '🐢': 'turtle.json',
+    '🐊': 'crocodile.json',
+    '🐍': 'snake.json',
+    '🐩': 'poodle.json',
+    '🐕': 'dog.json',
+    '🦮': 'guide-dog.json',
+    '🐖': 'pig.json',
+    '🦘': 'kangaroo.json',
+    '🐅': 'tiger.json',
+    '🐒': 'monkey.json',
+    '🦍': 'gorilla.json',
+    '🦧': 'orangutan.json',
+    '🦦': 'otter.json',
+    '🐓': 'rooster.json',
+    '🦅': 'eagle.json',
+    '🦉': 'owl.json',
+    '🦚': 'peacock.json',
+    '🦭': 'seal.json',
+    '🦈': 'shark.json',
+    '🐬': 'dolphin.json',
+    '🐳': 'whale.json',
+    '🐟': 'fish.json',
+    '🐡': 'blowfish.json',
+    '🦞': 'lobster.json',
+    '🦀': 'crab.json',
+    '🐙': 'octopus.json',
+    '🦂': 'scorpion.json',
+    '🐌': 'snail.json',
+    '🐜': 'ant.json',
+    '🪳': 'cockroach.json',
+    '🪰': 'fly.json',
+    '🐝': 'bee.json',
+    '🐞': 'lady-bug.json',
+    '🌯': 'burrito.json',
+    '🍻': 'clinking-beer-mugs.json',
+    '🍾': 'bottle-with-popping-cork.json',
+    '🚨': 'police-car-light.json',
+    '🚗': 'automobile.json',
+    '🚕': 'taxi.json',
+    '🛸': 'flying-saucer.json',
+    '🚀': 'rocket.json',
+    '🛫': 'airplane-departure.json',
+    '🎢': 'roller-coaster.json',
+    '🎡': 'ferris-wheel.json',
+    '🎈': 'balloon.json',
+    '🎁': 'wrapped-gift.json',
+    '🎆': 'fireworks.json',
+    '💸': 'money-with-wings.json',
+    '💎': 'gem-stone.json',
+    '🎓': 'graduation-cap.json',
+    '⏰': 'alarm-clock.json',
+    '🔔': 'bell.json',
+    '💣': 'bomb.json',
+    '❗': 'exclamation.json',
+    '❓': 'question.json',
+    '❌': 'cross-mark.json',
+    '🏁': 'chequered-flag.json',
+    '🚩': 'triangular-flag.json',
+    '🏴': 'black-flag.json',
   };
 
   static bool supported(String emoji) {
diff --git a/lib/src/views/settings/subscription/subscription.view.dart b/lib/src/views/settings/subscription/subscription.view.dart
index dbaf3bc..de8b192 100644
--- a/lib/src/views/settings/subscription/subscription.view.dart
+++ b/lib/src/views/settings/subscription/subscription.view.dart
@@ -295,7 +295,9 @@ class _PlanCardState extends State<PlanCard> {
                   },
                   label: const Text('Manage subscription'),
                 ),
-              if (widget.onPurchase != null && monthlyProduct != null)
+              if (widget.onPurchase != null &&
+                  monthlyProduct != null &&
+                  !isPayingUser(currentPlan))
                 OutlinedButton.icon(
                   onPressed: _isLoading != null
                       ? null
@@ -315,8 +317,7 @@ class _PlanCardState extends State<PlanCard> {
                   ),
                 ),
               if (widget.onPurchase != null &&
-                  (yearlyProduct != null ||
-                      currentPlan == SubscriptionPlan.Free))
+                  (yearlyProduct != null && !isPayingUser(currentPlan)))
                 FilledButton.icon(
                   onPressed: _isLoading != null
                       ? null
@@ -331,7 +332,7 @@ class _PlanCardState extends State<PlanCard> {
                   label: Text(
                     context.lang.upgradeToPaidPlanButton(
                       widget.plan.name,
-                      ' (${getFormattedPrice(yearlyProduct!)}/${context.lang.year})',
+                      ' (${getFormattedPrice(yearlyProduct)}/${context.lang.year})',
                     ),
                   ),
                 ),