[Release] Hotfix 6.6.2 => 6.6.3 (patch) (#3777)

* chore: bump version to 6.6.3 * fix: event share url no twitter handle * fix: mobile only loading status and hidden android contact us tips --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: LeifXu <[email protected]>
DimensionDev · Jan 19, 2025 · 5cd555d · 5cd555d
1 parent db738bb
commit 5cd555d
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 21 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "mask.social",
     "type": "module",
-    "version": "6.6.2",
+    "version": "6.6.3",
     "private": true,
     "packageManager": "[email protected]",
     "scripts": {

diff --git a/src/components/Activity/ActivityMobileOnly.tsx b/src/components/Activity/ActivityMobileOnly.tsx
@@ -4,10 +4,20 @@ import { Trans } from '@lingui/react/macro';
 import type { PropsWithChildren } from 'react';
 
 import { Link } from '@/components/Activity/Link.js';
+import { LoadingIcon } from '@/components/LoadingIcon.js';
 import { FIREFLY_APP_APP_STORE_URL, FIREFLY_APP_GOOGLE_PLAY_URL, FIREFLY_TELEGRAM_URL } from '@/constants/index.js';
+import { useMounted } from '@/hooks/useMounted.js';
 import { fireflyBridgeProvider } from '@/providers/firefly/Bridge.js';
 
 export function ActivityMobileOnly({ children, disabled = false }: PropsWithChildren<{ disabled?: boolean }>) {
+    const isMounted = useMounted();
+    if (!isMounted) {
+        return (
+            <div className="flex w-full items-center justify-center py-6">
+                <LoadingIcon />
+            </div>
+        );
+    }
     if (disabled || fireflyBridgeProvider.supported) return children;
     return (
         <div className="flex w-full flex-col px-6">

diff --git a/src/components/Activity/ActivityTasks/ActivityTrumpTasks.tsx b/src/components/Activity/ActivityTasks/ActivityTrumpTasks.tsx
@@ -40,7 +40,7 @@ export function ActivityTrumpTasks({
     const { data: claimCondition } = useActivityClaimCondition(Source.Twitter);
     const list = useActivityPremiumList(Source.Twitter);
     const isPremium = list.some((x) => x.verified);
-    const followPenguTwitterProfile = {
+    const followTrumpTwitterProfile = {
         handle: TRUMP_TWITTER_PROFILE.handle,
         profileId: TRUMP_TWITTER_PROFILE.platform_id,
         following: claimCondition?.x?.followingTrump,
@@ -102,18 +102,18 @@ Check your eligibility and participate here ${shareUrl}
                 <div
                     className={classNames(
                         'w-full rounded-2xl p-3 text-sm font-normal leading-6',
-                        followPenguTwitterProfile.following ? 'bg-success/10 dark:bg-success/20' : 'bg-bg',
+                        followTrumpTwitterProfile.following ? 'bg-success/10 dark:bg-success/20' : 'bg-bg',
                     )}
                 >
-                    <ActivityVerifyText verified={followPenguTwitterProfile.following}>
+                    <ActivityVerifyText verified={followTrumpTwitterProfile.following}>
                         <h3>
                             <Trans>
                                 Followed{' '}
                                 <Link
                                     className="inline text-highlight"
-                                    href={resolveProfileUrl(Source.Twitter, followPenguTwitterProfile.profileId)}
+                                    href={resolveProfileUrl(Source.Twitter, followTrumpTwitterProfile.profileId)}
                                 >
-                                    @{followPenguTwitterProfile.handle}
+                                    @{followTrumpTwitterProfile.handle}
                                 </Link>{' '}
                                 on X before Jan 18, 2025
                             </Trans>
@@ -150,14 +150,16 @@ Check your eligibility and participate here ${shareUrl}
                     />
                 </div>
             </div>
-            <p className="mb-4 w-full text-center text-[10px]">
-                <Trans>
-                    All rights reserved by Firefly. For any inquiries, please{' '}
-                    <Link href={FIREFLY_TELEGRAM_URL} target="_blank" className="inline text-highlight">
-                        contact us.
-                    </Link>
-                </Trans>
-            </p>
+            {!IS_ANDROID ? (
+                <p className="mb-4 w-full text-center text-[10px]">
+                    <Trans>
+                        All rights reserved by Firefly. For any inquiries, please{' '}
+                        <Link href={FIREFLY_TELEGRAM_URL} target="_blank" className="inline text-highlight">
+                            contact us.
+                        </Link>
+                    </Trans>
+                </p>
+            ) : null}
             <div
                 className={classNames(
                     'sticky bottom-0 mt-auto w-full bg-primaryBottom px-4',

diff --git a/src/components/Activity/hooks/useActivityCurrentAccountHandle.ts b/src/components/Activity/hooks/useActivityCurrentAccountHandle.ts
@@ -9,7 +9,7 @@ export function useActivityCurrentAccountHandle(source: SocialSource) {
     const { data } = useActivityConnections();
     switch (source) {
         case Source.Twitter:
-            return data?.rawConnections.twitter.connected[0]?.twitters?.[0].handle;
+            return data?.rawConnections.twitter.connected[0]?.handle;
         case Source.Lens:
             return data?.rawConnections.lens.connected[0]?.lens?.[0].fullHandle;
         case Source.Farcaster:

diff --git a/src/locales/en/messages.po b/src/locales/en/messages.po
@@ -575,7 +575,7 @@ msgstr "Failed to follow @{handle} on {0}."
 msgid "Bookmarks"
 msgstr "Bookmarks"
 
-#. placeholder {0}: followPenguTwitterProfile.handle
+#. placeholder {0}: followTrumpTwitterProfile.handle
 msgid "Followed <0>@{0}</0> on X before Jan 18, 2025"
 msgstr "Followed <0>@{0}</0> on X before Jan 18, 2025"
 

diff --git a/src/locales/ja/messages.po b/src/locales/ja/messages.po
@@ -580,7 +580,7 @@ msgstr ""
 msgid "Bookmarks"
 msgstr ""
 
-#. placeholder {0}: followPenguTwitterProfile.handle
+#. placeholder {0}: followTrumpTwitterProfile.handle
 msgid "Followed <0>@{0}</0> on X before Jan 18, 2025"
 msgstr ""
 

diff --git a/src/locales/ko/messages.po b/src/locales/ko/messages.po
@@ -580,7 +580,7 @@ msgstr ""
 msgid "Bookmarks"
 msgstr ""
 
-#. placeholder {0}: followPenguTwitterProfile.handle
+#. placeholder {0}: followTrumpTwitterProfile.handle
 msgid "Followed <0>@{0}</0> on X before Jan 18, 2025"
 msgstr ""
 

diff --git a/src/locales/pseudo/messages.po b/src/locales/pseudo/messages.po
@@ -575,7 +575,7 @@ msgstr ""
 msgid "Bookmarks"
 msgstr ""
 
-#. placeholder {0}: followPenguTwitterProfile.handle
+#. placeholder {0}: followTrumpTwitterProfile.handle
 msgid "Followed <0>@{0}</0> on X before Jan 18, 2025"
 msgstr ""
 

diff --git a/src/locales/zh-Hans/messages.po b/src/locales/zh-Hans/messages.po
@@ -580,7 +580,7 @@ msgstr "在 {0} 上关注 @{handle} 失败。"
 msgid "Bookmarks"
 msgstr "收藏"
 
-#. placeholder {0}: followPenguTwitterProfile.handle
+#. placeholder {0}: followTrumpTwitterProfile.handle
 msgid "Followed <0>@{0}</0> on X before Jan 18, 2025"
 msgstr ""
 

diff --git a/src/locales/zh-Hant/messages.po b/src/locales/zh-Hant/messages.po
@@ -580,7 +580,7 @@ msgstr ""
 msgid "Bookmarks"
 msgstr "書籤"
 
-#. placeholder {0}: followPenguTwitterProfile.handle
+#. placeholder {0}: followTrumpTwitterProfile.handle
 msgid "Followed <0>@{0}</0> on X before Jan 18, 2025"
 msgstr ""
 

diff --git a/src/providers/types/Firefly.ts b/src/providers/types/Firefly.ts
@@ -829,6 +829,7 @@ export type AllConnections = {
         Array<{
             address: string;
             twitters: TwitterConnection[];
+            handle: string;
         }>
     >;
     wallet: Record<'connected' | 'unconnected', WalletConnection[]>;