feat: sync some changes on approval page on extension (#470)

* feat: display protocol for send * fix: balance change display * feat: add interacted before back
RabbyHub · Nov 5, 2024 · 12be0dc · 12be0dc
1 parent 0bc1856
commit 12be0dc
Show file tree

Hide file tree

Showing 26 changed files with 263 additions and 31 deletions.
diff --git a/apps/mobile/package.json b/apps/mobile/package.json
@@ -67,7 +67,7 @@
     "@rabby-wallet/gnosis-sdk": "1.3.8",
     "@rabby-wallet/object-multiplex": "workspace:^",
     "@rabby-wallet/persist-store": "workspace:^",
-    "@rabby-wallet/rabby-action": "0.1.3",
+    "@rabby-wallet/rabby-action": "0.1.4",
     "@rabby-wallet/rabby-api": "0.8.3",
     "@rabby-wallet/rabby-security-engine": "2.0.7",
     "@rabby-wallet/rabby-sign-bvm": "0.1.0",

diff --git a/apps/mobile/src/components/Approval/components/Actions/ApproveNFT.tsx b/apps/mobile/src/components/Approval/components/Actions/ApproveNFT.tsx
@@ -103,6 +103,17 @@ const ApproveNFT = ({
             </SubRow>
           </SubCol>
 
+          <SubCol>
+            <SubRow isTitle>
+              <Text style={commonStyle.subRowTitleText}>
+                {t('page.signTx.interacted')}
+              </Text>
+            </SubRow>
+            <SubRow>
+              <Values.Boolean value={requireData.hasInteraction} />
+            </SubRow>
+          </SubCol>
+
           <SecurityListItem
             id="1043"
             engineResult={engineResultMap['1043']}

diff --git a/apps/mobile/src/components/Approval/components/Actions/ApproveNFTCollection.tsx b/apps/mobile/src/components/Approval/components/Actions/ApproveNFTCollection.tsx
@@ -104,6 +104,17 @@ const ApproveNFTCollection = ({
             </SubRow>
           </SubCol>
 
+          <SubCol>
+            <SubRow isTitle>
+              <Text style={commonStyle.subRowTitleText}>
+                {t('page.signTx.interacted')}
+              </Text>
+            </SubRow>
+            <SubRow>
+              <Values.Boolean value={requireData.hasInteraction} />
+            </SubRow>
+          </SubCol>
+
           <SecurityListItem
             id="1053"
             engineResult={engineResultMap['1053']}

diff --git a/apps/mobile/src/components/Approval/components/Actions/ContractCall.tsx b/apps/mobile/src/components/Approval/components/Actions/ContractCall.tsx
@@ -80,6 +80,7 @@ const ContractCall = ({
                 protocol: requireData.protocol,
                 rank: requireData.rank,
                 address: requireData.id,
+                hasInteraction: requireData.hasInteraction,
                 chain,
               }}>
               <View ref={contractCallAddressRef}>
@@ -102,7 +103,16 @@ const ContractCall = ({
               />
             </SubRow>
           </SubCol>
-
+          <SubCol>
+            <SubRow isTitle>
+              <Text style={commonStyle.subRowTitleText}>
+                {t('page.signTx.interacted')}
+              </Text>
+            </SubRow>
+            <SubRow>
+              <Values.Boolean value={requireData.hasInteraction} />
+            </SubRow>
+          </SubCol>
           {isInWhitelist && (
             <SubCol>
               <SubRow isTitle>

diff --git a/apps/mobile/src/components/Approval/components/Actions/CrossSwapToken.tsx b/apps/mobile/src/components/Approval/components/Actions/CrossSwapToken.tsx
@@ -251,13 +251,21 @@ const CrossSwapToken = ({
               {!engineResultMap['1096'] && (
                 <>
                   <SubCol>
-                    <SubRow isTitle>{t('page.signTx.address')}</SubRow>
+                    <SubRow isTitle>
+                      <Text style={commonStyle.rowTitleText}>
+                        {t('page.signTx.address')}
+                      </Text>
+                    </SubRow>
                     <SubRow>
                       <Values.AccountAlias address={receiver} />
                     </SubRow>
                   </SubCol>
                   <SubCol>
-                    <SubRow isTitle>{t('page.addressDetail.source')}</SubRow>
+                    <SubRow isTitle>
+                      <Text style={commonStyle.rowTitleText}>
+                        {t('page.addressDetail.source')}
+                      </Text>
+                    </SubRow>
                     <SubRow>
                       <Values.KnownAddress address={receiver} />
                     </SubRow>
@@ -282,6 +290,7 @@ const CrossSwapToken = ({
                 rank: requireData.rank,
                 address: requireData.id,
                 chain,
+                hasInteraction: requireData.hasInteraction,
               }}>
               <View ref={crossSwapTokenAddressRef}>
                 <Values.Address address={requireData.id} chain={chain} />
@@ -303,6 +312,16 @@ const CrossSwapToken = ({
               />
             </SubRow>
           </SubCol>
+          <SubCol>
+            <SubRow isTitle>
+              <Text style={commonStyle.subRowTitleText}>
+                {t('page.signTx.interacted')}
+              </Text>
+            </SubRow>
+            <SubRow>
+              <Values.Boolean value={requireData.hasInteraction} />
+            </SubRow>
+          </SubCol>
           {isInWhitelist && (
             <SubCol>
               <SubRow isTitle>

diff --git a/apps/mobile/src/components/Approval/components/Actions/CrossToken.tsx b/apps/mobile/src/components/Approval/components/Actions/CrossToken.tsx
@@ -242,13 +242,21 @@ const Swap = ({
               {!engineResultMap['1103'] && (
                 <>
                   <SubCol>
-                    <SubRow isTitle>{t('page.signTx.address')}</SubRow>
+                    <SubRow isTitle>
+                      <Text style={commonStyle.rowTitleText}>
+                        {t('page.signTx.address')}
+                      </Text>
+                    </SubRow>
                     <SubRow>
                       <Values.AccountAlias address={receiver} />
                     </SubRow>
                   </SubCol>
                   <SubCol>
-                    <SubRow isTitle>{t('page.addressDetail.source')}</SubRow>
+                    <SubRow isTitle>
+                      <Text style={commonStyle.rowTitleText}>
+                        {t('page.addressDetail.source')}
+                      </Text>
+                    </SubRow>
                     <SubRow>
                       <Values.KnownAddress address={receiver} />
                     </SubRow>
@@ -272,6 +280,7 @@ const Swap = ({
                 protocol: requireData.protocol,
                 rank: requireData.rank,
                 address: requireData.id,
+                hasInteraction: requireData.hasInteraction,
                 chain,
               }}>
               <View ref={crossTokenAddressRef}>

diff --git a/apps/mobile/src/components/Approval/components/Actions/MultiSwap.tsx b/apps/mobile/src/components/Approval/components/Actions/MultiSwap.tsx
@@ -196,7 +196,16 @@ const MultiSwap = ({
               <ProtocolListItem protocol={requireData.protocol} />
             </SubRow>
           </SubCol>
-
+          <SubCol>
+            <SubRow isTitle>
+              <Text style={commonStyle.subRowTitleText}>
+                {t('page.signTx.interacted')}
+              </Text>
+            </SubRow>
+            <SubRow>
+              <Values.Boolean value={requireData.hasInteraction} />
+            </SubRow>
+          </SubCol>
           {isInWhitelist && (
             <SubCol>
               <SubRow isTitle>

diff --git a/apps/mobile/src/components/Approval/components/Actions/Send.tsx b/apps/mobile/src/components/Approval/components/Actions/Send.tsx
@@ -128,6 +128,18 @@ const Send = ({
               />
             </SubRow>
           </SubCol>
+          {requireData.protocol && (
+            <SubCol>
+              <SubRow isTitle>
+                <Text style={commonStyle.subRowTitleText}>
+                  {t('page.signTx.protocol')}
+                </Text>
+              </SubRow>
+              <SubRow>
+                <Values.Protocol value={requireData.protocol} />
+              </SubRow>
+            </SubCol>
+          )}
           {!!requireData.contract && (
             <SubCol>
               <SubRow isTitle>

diff --git a/apps/mobile/src/components/Approval/components/Actions/SendNFT.tsx b/apps/mobile/src/components/Approval/components/Actions/SendNFT.tsx
@@ -154,7 +154,9 @@ const SendNFT = ({
           )}
           {!!requireData.name && (
             <SubCol nested={!isLabelAddress}>
-              <SubRow>{isLabelAddress ? t('page.signTx.label') : ' '}</SubRow>
+              <SubRow>
+                <Text>{isLabelAddress ? t('page.signTx.label') : ' '}</Text>
+              </SubRow>
               <SubRow>
                 {isLabelAddress ? (
                   <LogoWithText

diff --git a/apps/mobile/src/components/Approval/components/Actions/Swap.tsx b/apps/mobile/src/components/Approval/components/Actions/Swap.tsx
@@ -330,13 +330,21 @@ const Swap = ({
               {!engineResultMap['1069'] && (
                 <>
                   <SubCol>
-                    <SubRow isTitle>{t('page.signTx.address')}</SubRow>
+                    <SubRow isTitle>
+                      <Text style={commonStyle.rowTitleText}>
+                        {t('page.signTx.address')}
+                      </Text>
+                    </SubRow>
                     <SubRow>
                       <Values.AccountAlias address={receiver} />
                     </SubRow>
                   </SubCol>
                   <SubCol>
-                    <SubRow isTitle>{t('page.addressDetail.source')}</SubRow>
+                    <SubRow isTitle>
+                      <Text style={commonStyle.rowTitleText}>
+                        {t('page.addressDetail.source')}
+                      </Text>
+                    </SubRow>
                     <SubRow>
                       <Values.KnownAddress address={receiver} />
                     </SubRow>
@@ -360,6 +368,7 @@ const Swap = ({
                 protocol: requireData.protocol,
                 rank: requireData.rank,
                 address: requireData.id,
+                hasInteraction: requireData.hasInteraction,
                 chain,
               }}>
               <View ref={swapContractRef}>
@@ -382,6 +391,16 @@ const Swap = ({
               />
             </SubRow>
           </SubCol>
+          <SubCol>
+            <SubRow isTitle>
+              <Text style={commonStyle.rowTitleText}>
+                {t('page.signTx.hasInteraction')}
+              </Text>
+            </SubRow>
+            <SubRow>
+              <Values.Interacted value={requireData.hasInteraction} />
+            </SubRow>
+          </SubCol>
           {isInWhitelist && (
             <SubCol>
               <SubRow isTitle>

diff --git a/apps/mobile/src/components/Approval/components/Actions/SwapLimitPay.tsx b/apps/mobile/src/components/Approval/components/Actions/SwapLimitPay.tsx
@@ -178,6 +178,16 @@ const SwapLimitPay = ({
               <ProtocolListItem protocol={requireData.protocol} />
             </SubRow>
           </SubCol>
+          <SubCol>
+            <SubRow isTitle>
+              <Text style={commonStyle.rowTitleText}>
+                {t('page.signTx.hasInteraction')}
+              </Text>
+            </SubRow>
+            <SubRow>
+              <Values.Interacted value={requireData.hasInteraction} />
+            </SubRow>
+          </SubCol>
 
           {isInWhitelist && (
             <SubCol>

diff --git a/apps/mobile/src/components/Approval/components/Actions/TokenApprove.tsx b/apps/mobile/src/components/Approval/components/Actions/TokenApprove.tsx
@@ -363,6 +363,16 @@ const TokenApprove = ({
               />
             </SubRow>
           </SubCol>
+          <SubCol>
+            <SubRow isTitle>
+              <Text style={commonStyle.rowTitleText}>
+                {t('page.signTx.hasInteraction')}
+              </Text>
+            </SubRow>
+            <SubRow>
+              <Values.Interacted value={requireData.hasInteraction} />
+            </SubRow>
+          </SubCol>
 
           <SecurityListItem
             id="1022"

diff --git a/apps/mobile/src/components/Approval/components/Actions/UnWrapToken.tsx b/apps/mobile/src/components/Approval/components/Actions/UnWrapToken.tsx
@@ -161,13 +161,21 @@ const UnWrapToken = ({
               {!engineResultMap['1093'] && (
                 <>
                   <SubCol>
-                    <SubRow isTitle>{t('page.signTx.address')}</SubRow>
+                    <SubRow isTitle>
+                      <Text style={commonStyle.rowTitleText}>
+                        {t('page.signTx.address')}
+                      </Text>
+                    </SubRow>
                     <SubRow>
                       <Values.AccountAlias address={receiver} />
                     </SubRow>
                   </SubCol>
                   <SubCol>
-                    <SubRow isTitle>{t('page.addressDetail.source')}</SubRow>
+                    <SubRow isTitle>
+                      <Text style={commonStyle.rowTitleText}>
+                        {t('page.addressDetail.source')}
+                      </Text>
+                    </SubRow>
                     <SubRow>
                       <Values.KnownAddress address={receiver} />
                     </SubRow>
@@ -191,6 +199,7 @@ const UnWrapToken = ({
                 protocol: requireData.protocol,
                 rank: requireData.rank,
                 address: requireData.id,
+                hasInteraction: requireData.hasInteraction,
                 chain,
               }}>
               <View ref={unwrapTokenAddressRef}>
@@ -213,6 +222,16 @@ const UnWrapToken = ({
               />
             </SubRow>
           </SubCol>
+          <SubCol>
+            <SubRow isTitle>
+              <Text style={commonStyle.rowTitleText}>
+                {t('page.signTx.hasInteraction')}
+              </Text>
+            </SubRow>
+            <SubRow>
+              <Values.Interacted value={requireData.hasInteraction} />
+            </SubRow>
+          </SubCol>
           {isInWhitelist && (
             <SubCol>
               <SubRow isTitle>

diff --git a/apps/mobile/src/components/Approval/components/Actions/WrapToken.tsx b/apps/mobile/src/components/Approval/components/Actions/WrapToken.tsx
@@ -169,13 +169,21 @@ const WrapToken = ({
               {!engineResultMap['1093'] && (
                 <>
                   <SubCol>
-                    <SubRow isTitle>{t('page.signTx.address')}</SubRow>
+                    <SubRow isTitle>
+                      <Text style={commonStyle.rowTitleText}>
+                        {t('page.signTx.address')}
+                      </Text>
+                    </SubRow>
                     <SubRow>
                       <Values.AccountAlias address={receiver} />
                     </SubRow>
                   </SubCol>
                   <SubCol>
-                    <SubRow isTitle>{t('page.addressDetail.source')}</SubRow>
+                    <SubRow isTitle>
+                      <Text style={commonStyle.rowTitleText}>
+                        {t('page.addressDetail.source')}
+                      </Text>
+                    </SubRow>
                     <SubRow>
                       <Values.KnownAddress address={receiver} />
                     </SubRow>
@@ -199,6 +207,7 @@ const WrapToken = ({
                 protocol: requireData.protocol,
                 rank: requireData.rank,
                 address: requireData.id,
+                hasInteraction: requireData.hasInteraction,
                 chain,
               }}>
               <View ref={wrapTokenAddressRef}>
@@ -221,6 +230,16 @@ const WrapToken = ({
               />
             </SubRow>
           </SubCol>
+          <SubCol>
+            <SubRow isTitle>
+              <Text style={commonStyle.rowTitleText}>
+                {t('page.signTx.hasInteraction')}
+              </Text>
+            </SubRow>
+            <SubRow>
+              <Values.Interacted value={requireData.hasInteraction} />
+            </SubRow>
+          </SubCol>
           {isInWhitelist && (
             <SubCol>
               <SubRow isTitle>

diff --git a/apps/mobile/src/components/Approval/components/Actions/components/UserListDrawer.tsx b/apps/mobile/src/components/Approval/components/Actions/components/UserListDrawer.tsx
@@ -70,7 +70,7 @@ const getStyles = (colors: AppColorsVariants) =>
 
 interface Props {
   address: string;
-  chain: Chain;
+  chain?: Chain;
   onWhitelist: boolean;
   onBlacklist: boolean;
   visible: boolean;
@@ -113,7 +113,7 @@ const UserListDrawer = ({
       <BottomSheetView style={styles.mainView}>
         <AppBottomSheetModalTitle
           title={t('page.signTx.myMarkWithContract', {
-            chainName: chain.name,
+            chainName: chain?.name,
           })}
         />
         <View style={styles.footer}>