Merge branch 'feat/optimism' into develop

TrustlessComputer · Jan 22, 2024 · 04a8b9e · 04a8b9e
2 parents 2985126 + 16fbffd
commit 04a8b9e
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 57 deletions.
diff --git a/src/modules/Whitelist/AllowBTCMessage/index.tsx b/src/modules/Whitelist/AllowBTCMessage/index.tsx
@@ -21,27 +21,25 @@ const AllowBTCMessage = () => {
       )
     }
 
-    if (amount.txsCount) {
-      return <></>
-    }
+    return <></>;
 
-    return (
-      <Flex className={cs(styles.container, {
-        [styles.container__congrats as string]: !!amount.txsCount
-      })}>
-        {amount.txsCount ? (
-          <Flex flexDirection="column" w="100%" alignItems="center">
-            <p>You've spent <span>{formatCurrency(amount.fee, 0)} BTC</span> for gas fees across <span>{formatCurrency(amount.txsCount, 0)} transactions</span></p>
-            <p>Congratulations, you've earned <span>{formatCurrency(amount.point, 0)} points</span></p>
-            {/*<Button onClick={() => shareTwitterSignature({ fee: amount.fee, point: amount.point, txsCount: amount.txsCount })}>Share now</Button>*/}
-          </Flex>
-        ) : (
-          <p>
-            No transactions found. Please connect another wallet and try again.
-          </p>
-        )}
-      </Flex>
-    )
+    // return (
+    //   <Flex className={cs(styles.container, {
+    //     [styles.container__congrats as string]: !!amount.txsCount
+    //   })}>
+    //     {amount.txsCount ? (
+    //       <Flex flexDirection="column" w="100%" alignItems="center">
+    //         <p>You've spent <span>{formatCurrency(amount.fee, 0)} BTC</span> for gas fees across <span>{formatCurrency(amount.txsCount, 0)} transactions</span></p>
+    //         <p>Congratulations, you've earned <span>{formatCurrency(amount.point, 0)} points</span></p>
+    //         {/*<Button onClick={() => shareTwitterSignature({ fee: amount.fee, point: amount.point, txsCount: amount.txsCount })}>Share now</Button>*/}
+    //       </Flex>
+    //     ) : (
+    //       <p>
+    //         No transactions found. Please connect another wallet and try again.
+    //       </p>
+    //     )}
+    //   </Flex>
+    // )
   }, [loaded, status, isProcessing, amount]);
 
   return (

diff --git a/src/modules/Whitelist/AllowCelestiaMessage/index.tsx b/src/modules/Whitelist/AllowCelestiaMessage/index.tsx
@@ -20,23 +20,23 @@ const AllowCelestiaMessage = () => {
         </Flex>
       )
     }
-
-    return (
-      <Flex className={cs(styles.container, {
-        [styles.container__congrats as string]: !!Number(amount.point || '0')
-      })}>
-        {!!Number(amount.point || '0') ? (
-          <Flex flexDirection="column" w="100%" alignItems="center">
-            <p>You are holding or staking <span>{formatCurrency(amount.fee, 0)} TIA</span> in your Keplr wallet</p>
-            <p>Congratulations, you've earned <span>{formatCurrency(amount.point, 0)} points</span></p>
-          </Flex>
-        ) : (
-          <p>
-            No transactions found. Please connect another wallet and try again.
-          </p>
-        )}
-      </Flex>
-    )
+    return <></>;
+    // return (
+    //   <Flex className={cs(styles.container, {
+    //     [styles.container__congrats as string]: !!Number(amount.point || '0')
+    //   })}>
+    //     {!!Number(amount.point || '0') ? (
+    //       <Flex flexDirection="column" w="100%" alignItems="center">
+    //         <p>You are holding or staking <span>{formatCurrency(amount.fee, 0)} TIA</span> in your Keplr wallet</p>
+    //         <p>Congratulations, you've earned <span>{formatCurrency(amount.point, 0)} points</span></p>
+    //       </Flex>
+    //     ) : (
+    //       <p>
+    //         No transactions found. Please connect another wallet and try again.
+    //       </p>
+    //     )}
+    //   </Flex>
+    // )
   }, [loaded, status, isProcessing, amount]);
 
   return (

diff --git a/src/modules/Whitelist/steps/index.tsx b/src/modules/Whitelist/steps/index.tsx
@@ -234,26 +234,6 @@ const Steps = () => {
           desc: 'per 1000 sats'
         }
       },
-      {
-        title: 'Are you a Modular Blockchain Pioneer?',
-        desc: 'The more TIA or staked TIA you hold, the more points you’ll get. Connect your Keplr or Leap wallet to prove the account ownership.',
-        actionText: isNeedClaimCelestiaPoint ? `Tweet to claim ${formatCurrency(allowCelestia.amount.unClaimedPoint, 0, 0)} pts` : 'How modular are you?',
-        actionHandle: isNeedClaimCelestiaPoint ? async () => {
-          onShareModular();
-          await requestClaimCelestiaPoint(allowCelestia.status)
-          dispatch(requestReload())
-        } : onSignModular,
-        actionTextSecondary: isNeedClaimCelestiaPoint ? "Verify another wallet" : undefined,
-        actionHandleSecondary: isNeedClaimCelestiaPoint ? onSignModular : undefined,
-        isActive: !!token,
-        isDone: !!token,
-        step: MultiplierStep.modular,
-        image: "ic-celestia.svg",
-        right: {
-          title: '+100 PTS',
-          desc: 'per TIA'
-        }
-      },
       {
         title: 'Are you a L2 OG?',
         desc: 'The more Blast you staked or Optimism you hold, the more points you’ll get. Connect your Metamask wallet to prove the account ownership.',
@@ -287,6 +267,26 @@ const Steps = () => {
           }
         ]
       },
+      {
+        title: 'Are you a Modular Blockchain Pioneer?',
+        desc: 'The more TIA or staked TIA you hold, the more points you’ll get. Connect your Keplr or Leap wallet to prove the account ownership.',
+        actionText: isNeedClaimCelestiaPoint ? `Tweet to claim ${formatCurrency(allowCelestia.amount.unClaimedPoint, 0, 0)} pts` : 'How modular are you?',
+        actionHandle: isNeedClaimCelestiaPoint ? async () => {
+          onShareModular();
+          await requestClaimCelestiaPoint(allowCelestia.status)
+          dispatch(requestReload())
+        } : onSignModular,
+        actionTextSecondary: isNeedClaimCelestiaPoint ? "Verify another wallet" : undefined,
+        actionHandleSecondary: isNeedClaimCelestiaPoint ? onSignModular : undefined,
+        isActive: !!token,
+        isDone: !!token,
+        step: MultiplierStep.modular,
+        image: "ic-celestia.svg",
+        right: {
+          title: '+100 PTS',
+          desc: 'per TIA'
+        }
+      },
     ];
     if (token) {
       tasks.push(authenTask)