Merge branch 'feat/has-interaction' into tmp/20241018

RabbyHub · Oct 17, 2024 · 1865cc2 · 1865cc2
2 parents e20c9d7 + 62ed7ba
commit 1865cc2
Show file tree

Hide file tree

Showing 23 changed files with 130 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -60,7 +60,7 @@
     "@rabby-wallet/eth-watch-keyring": "1.0.0",
     "@rabby-wallet/gnosis-sdk": "1.3.8",
     "@rabby-wallet/page-provider": "0.4.2",
-    "@rabby-wallet/rabby-action": "0.1.3",
+    "@rabby-wallet/rabby-action": "0.1.4",
     "@rabby-wallet/rabby-api": "0.8.2",
     "@rabby-wallet/rabby-security-engine": "2.0.7",
     "@rabby-wallet/rabby-swap": "0.0.40",

diff --git a/src/ui/views/Approval/components/Actions/ApproveNFT.tsx b/src/ui/views/Approval/components/Actions/ApproveNFT.tsx
@@ -118,6 +118,12 @@ const ApproveNFT = ({
               <ProtocolListItem protocol={requireData.protocol} />
             </SubRow>
           </SubCol>
+          <SubCol>
+            <SubRow isTitle>{t('page.signTx.interacted')}</SubRow>
+            <SubRow>
+              <Values.Boolean value={requireData.hasInteraction} />
+            </SubRow>
+          </SubCol>
 
           <SecurityListItem
             id="1043"

diff --git a/src/ui/views/Approval/components/Actions/ApproveNFTCollection.tsx b/src/ui/views/Approval/components/Actions/ApproveNFTCollection.tsx
@@ -60,7 +60,6 @@ const ApproveNFTCollection = ({
   engineResults: Result[];
 }) => {
   const actionData = data!;
-  const dispatch = useRabbyDispatch();
   const { t } = useTranslation();
 
   const engineResultMap = useMemo(() => {
@@ -122,6 +121,12 @@ const ApproveNFTCollection = ({
               <ProtocolListItem protocol={requireData.protocol} />
             </SubRow>
           </SubCol>
+          <SubCol>
+            <SubRow isTitle>{t('page.signTx.interacted')}</SubRow>
+            <SubRow>
+              <Values.Boolean value={requireData.hasInteraction} />
+            </SubRow>
+          </SubCol>
 
           <SecurityListItem
             id="1053"

diff --git a/src/ui/views/Approval/components/Actions/ContractCall.tsx b/src/ui/views/Approval/components/Actions/ContractCall.tsx
@@ -105,6 +105,7 @@ const ContractCall = ({
                 protocol: requireData.protocol,
                 rank: requireData.rank,
                 address: requireData.id,
+                hasInteraction: requireData.hasInteraction,
                 chain,
               }}
             >
@@ -124,6 +125,12 @@ const ContractCall = ({
               <ProtocolListItem protocol={requireData.protocol} />
             </SubRow>
           </SubCol>
+          <SubCol>
+            <SubRow isTitle>{t('page.signTx.interacted')}</SubRow>
+            <SubRow>
+              <Values.Boolean value={requireData.hasInteraction} />
+            </SubRow>
+          </SubCol>
           {isInWhitelist && (
             <SubCol>
               <SubRow isTitle>{t('page.signTx.myMark')}</SubRow>

diff --git a/src/ui/views/Approval/components/Actions/CrossSwapToken.tsx b/src/ui/views/Approval/components/Actions/CrossSwapToken.tsx
@@ -247,6 +247,7 @@ const CrossSwapToken = ({
                 protocol: requireData.protocol,
                 rank: requireData.rank,
                 address: requireData.id,
+                hasInteraction: requireData.hasInteraction,
                 chain,
               }}
             >
@@ -266,6 +267,12 @@ const CrossSwapToken = ({
               <ProtocolListItem protocol={requireData.protocol} />
             </SubRow>
           </SubCol>
+          <SubCol>
+            <SubRow isTitle>{t('page.signTx.interacted')}</SubRow>
+            <SubRow>
+              <Values.Boolean value={requireData.hasInteraction} />
+            </SubRow>
+          </SubCol>
           {isInWhitelist && (
             <SubCol>
               <SubRow isTitle>{t('page.signTx.myMark')}</SubRow>

diff --git a/src/ui/views/Approval/components/Actions/CrossToken.tsx b/src/ui/views/Approval/components/Actions/CrossToken.tsx
@@ -248,6 +248,7 @@ const Swap = ({
                 protocol: requireData.protocol,
                 rank: requireData.rank,
                 address: requireData.id,
+                hasInteraction: requireData.hasInteraction,
                 chain,
               }}
             >

diff --git a/src/ui/views/Approval/components/Actions/MultiSwap.tsx b/src/ui/views/Approval/components/Actions/MultiSwap.tsx
@@ -192,6 +192,12 @@ const MultiSwap = ({
               <ProtocolListItem protocol={requireData.protocol} />
             </SubRow>
           </SubCol>
+          <SubCol>
+            <SubRow isTitle>{t('page.signTx.interacted')}</SubRow>
+            <SubRow>
+              <Values.Boolean value={requireData.hasInteraction} />
+            </SubRow>
+          </SubCol>
 
           {isInWhitelist && (
             <SubCol>

diff --git a/src/ui/views/Approval/components/Actions/Swap.tsx b/src/ui/views/Approval/components/Actions/Swap.tsx
@@ -307,6 +307,7 @@ const Swap = ({
                 protocol: requireData.protocol,
                 rank: requireData.rank,
                 address: requireData.id,
+                hasInteraction: requireData.hasInteraction,
                 chain,
               }}
             >
@@ -326,6 +327,12 @@ const Swap = ({
               <ProtocolListItem protocol={requireData.protocol} />
             </SubRow>
           </SubCol>
+          <SubCol>
+            <SubRow isTitle>{t('page.signTx.hasInteraction')}</SubRow>
+            <SubRow>
+              <Values.Interacted value={requireData.hasInteraction} />
+            </SubRow>
+          </SubCol>
           {isInWhitelist && (
             <SubCol>
               <SubRow isTitle>{t('page.signTx.myMark')}</SubRow>

diff --git a/src/ui/views/Approval/components/Actions/SwapLimitPay.tsx b/src/ui/views/Approval/components/Actions/SwapLimitPay.tsx
@@ -183,6 +183,12 @@ const SwapLimitPay = ({
               <ProtocolListItem protocol={requireData.protocol} />
             </SubRow>
           </SubCol>
+          <SubCol>
+            <SubRow isTitle>{t('page.signTx.hasInteraction')}</SubRow>
+            <SubRow>
+              <Values.Interacted value={requireData.hasInteraction} />
+            </SubRow>
+          </SubCol>
 
           {isInWhitelist && (
             <SubCol>

diff --git a/src/ui/views/Approval/components/Actions/TokenApprove.tsx b/src/ui/views/Approval/components/Actions/TokenApprove.tsx
@@ -303,6 +303,12 @@ const TokenApprove = ({
               <ProtocolListItem protocol={requireData.protocol} />
             </SubRow>
           </SubCol>
+          <SubCol>
+            <SubRow isTitle>{t('page.signTx.hasInteraction')}</SubRow>
+            <SubRow>
+              <Values.Interacted value={requireData.hasInteraction} />
+            </SubRow>
+          </SubCol>
 
           <SecurityListItem
             id="1022"

diff --git a/src/ui/views/Approval/components/Actions/UnWrapToken.tsx b/src/ui/views/Approval/components/Actions/UnWrapToken.tsx
@@ -187,6 +187,7 @@ const UnWrapToken = ({
                 protocol: requireData.protocol,
                 rank: requireData.rank,
                 address: requireData.id,
+                hasInteraction: requireData.hasInteraction,
                 chain,
               }}
             >
@@ -206,6 +207,12 @@ const UnWrapToken = ({
               <ProtocolListItem protocol={requireData.protocol} />
             </SubRow>
           </SubCol>
+          <SubCol>
+            <SubRow isTitle>{t('page.signTx.hasInteraction')}</SubRow>
+            <SubRow>
+              <Values.Interacted value={requireData.hasInteraction} />
+            </SubRow>
+          </SubCol>
           {isInWhitelist && (
             <SubCol>
               <SubRow isTitle>{t('page.signTx.myMark')}</SubRow>

diff --git a/src/ui/views/Approval/components/Actions/WrapToken.tsx b/src/ui/views/Approval/components/Actions/WrapToken.tsx
@@ -187,6 +187,7 @@ const WrapToken = ({
                 protocol: requireData.protocol,
                 rank: requireData.rank,
                 address: requireData.id,
+                hasInteraction: requireData.hasInteraction,
                 chain,
               }}
             >
@@ -206,6 +207,12 @@ const WrapToken = ({
               <ProtocolListItem protocol={requireData.protocol} />
             </SubRow>
           </SubCol>
+          <SubCol>
+            <SubRow isTitle>{t('page.signTx.hasInteraction')}</SubRow>
+            <SubRow>
+              <Values.Interacted value={requireData.hasInteraction} />
+            </SubRow>
+          </SubCol>
 
           {isInWhitelist && (
             <SubCol>

diff --git a/src/ui/views/Approval/components/Actions/components/ViewMorePopup/ContractPopup.tsx b/src/ui/views/Approval/components/Actions/components/ViewMorePopup/ContractPopup.tsx
@@ -16,6 +16,7 @@ interface ContractData {
   bornAt: number | null;
   rank: number | null;
   title?: string;
+  hasInteraction: boolean;
 }
 
 export interface Props {
@@ -63,6 +64,12 @@ export const ContractPopup: React.FC<Props> = ({ data }) => {
             <Values.Protocol value={data.protocol} />
           </Row>
         </Col>
+        <Col>
+          <Row>{t('page.signTx.interacted')}</Row>
+          <Row>
+            <Values.Boolean value={data.hasInteraction} />
+          </Row>
+        </Col>
         <Col>
           <Row>{t('page.signTx.deployTimeTitle')}</Row>
           <Row>

diff --git a/src/ui/views/Approval/components/Actions/components/ViewMorePopup/NFTSpenderPopup.tsx b/src/ui/views/Approval/components/Actions/components/ViewMorePopup/NFTSpenderPopup.tsx
@@ -19,6 +19,7 @@ interface NFTSpenderData {
   isEOA: boolean;
   isDanger: boolean | null;
   isRevoke?: boolean;
+  hasInteraction: boolean;
 }
 
 export interface Props {
@@ -106,6 +107,12 @@ export const NFTSpenderPopup: React.FC<Props> = ({ data }) => {
               : '-'}
           </Row>
         </Col>
+        <Col>
+          <Row>{t('page.signTx.interacted')}</Row>
+          <Row>
+            <Values.Boolean value={data.hasInteraction} />
+          </Row>
+        </Col>
         <Col>
           <Row>{t('page.signTx.addressNote')}</Row>
           <Row>

diff --git a/src/ui/views/Approval/components/Actions/components/ViewMorePopup/SpenderPopup.tsx b/src/ui/views/Approval/components/Actions/components/ViewMorePopup/SpenderPopup.tsx
@@ -19,6 +19,7 @@ interface SpenderData {
   isEOA: boolean;
   isDanger: boolean | null;
   isRevoke?: boolean;
+  hasInteraction: boolean;
 }
 
 export interface Props {
@@ -106,6 +107,12 @@ export const SpenderPopup: React.FC<Props> = ({ data }) => {
               : '-'}
           </Row>
         </Col>
+        <Col>
+          <Row>{t('page.signTx.interacted')}</Row>
+          <Row>
+            <Values.Boolean value={data.hasInteraction} />
+          </Row>
+        </Col>
         <Col>
           <Row>{t('page.signTx.addressNote')}</Row>
           <Row>

diff --git a/src/ui/views/Approval/components/CommonAction.tsx b/src/ui/views/Approval/components/CommonAction.tsx
@@ -86,6 +86,7 @@ export const CommonAction = ({
                     protocol: requireData.protocol,
                     rank: requireData.rank,
                     address: requireData.id,
+                    hasInteraction: requireData.hasInteraction,
                     chain,
                   }}
                 >

diff --git a/src/ui/views/Approval/components/SignTx.tsx b/src/ui/views/Approval/components/SignTx.tsx
@@ -902,6 +902,7 @@ const SignTx = ({ params, origin }: SignTxProps) => {
       Modal.error({
         title: 'Error',
         content: e.message || JSON.stringify(e),
+        className: 'modal-support-darkmode',
       });
     }
   };
@@ -1005,7 +1006,10 @@ const SignTx = ({ params, origin }: SignTxProps) => {
         }
         resolveApproval();
       } catch (e) {
-        message.error(e.message);
+        message.error({
+          content: e.message,
+          className: 'modal-support-darkmode',
+        });
       }
     }
     return;

diff --git a/src/ui/views/Approval/components/TypedDataActions/BatchPermit2.tsx b/src/ui/views/Approval/components/TypedDataActions/BatchPermit2.tsx
@@ -156,6 +156,12 @@ const Permit2 = ({
               <ProtocolListItem protocol={requireData.protocol} />
             </SubRow>
           </SubCol>
+          <SubCol>
+            <SubRow isTitle>{t('page.signTx.hasInteraction')}</SubRow>
+            <SubRow>
+              <Values.Interacted value={requireData.hasInteraction} />
+            </SubRow>
+          </SubCol>
 
           <SecurityListItem
             id="1109"

diff --git a/src/ui/views/Approval/components/TypedDataActions/ContractCall.tsx b/src/ui/views/Approval/components/TypedDataActions/ContractCall.tsx
@@ -108,6 +108,7 @@ const ContractCall = ({
                 protocol: requireData.protocol,
                 rank: requireData.rank,
                 address: requireData.id,
+                hasInteraction: requireData.hasInteraction,
                 chain,
               }}
             >
@@ -127,6 +128,12 @@ const ContractCall = ({
               <ProtocolListItem protocol={requireData.protocol} />
             </SubRow>
           </SubCol>
+          <SubCol>
+            <SubRow isTitle>{t('page.signTx.hasInteraction')}</SubRow>
+            <SubRow>
+              <Values.Interacted value={requireData.hasInteraction} />
+            </SubRow>
+          </SubCol>
           {isInWhitelist && (
             <SubCol>
               <SubRow isTitle>{t('page.signTx.myMark')}</SubRow>

diff --git a/src/ui/views/Approval/components/TypedDataActions/Permit.tsx b/src/ui/views/Approval/components/TypedDataActions/Permit.tsx
@@ -131,6 +131,12 @@ const Permit = ({
               <ProtocolListItem protocol={requireData.protocol} />
             </SubRow>
           </SubCol>
+          <SubCol>
+            <SubRow isTitle>{t('page.signTx.hasInteraction')}</SubRow>
+            <SubRow>
+              <Values.Interacted value={requireData.hasInteraction} />
+            </SubRow>
+          </SubCol>
 
           <SecurityListItem
             id="1077"

diff --git a/src/ui/views/Approval/components/TypedDataActions/Permit2.tsx b/src/ui/views/Approval/components/TypedDataActions/Permit2.tsx
@@ -143,6 +143,12 @@ const Permit2 = ({
               <ProtocolListItem protocol={requireData.protocol} />
             </SubRow>
           </SubCol>
+          <SubCol>
+            <SubRow isTitle>{t('page.signTx.hasInteraction')}</SubRow>
+            <SubRow>
+              <Values.Interacted value={requireData.hasInteraction} />
+            </SubRow>
+          </SubCol>
 
           <SecurityListItem
             id="1071"

diff --git a/src/ui/views/Approval/components/TypedDataActions/SwapTokenOrder.tsx b/src/ui/views/Approval/components/TypedDataActions/SwapTokenOrder.tsx
@@ -241,6 +241,7 @@ const Permit = ({
                 rank: requireData.rank,
                 address: requireData.id,
                 chain,
+                hasInteraction: requireData.hasInteraction,
                 title: t('page.signTypedData.buyNFT.listOn'),
               }}
             >
@@ -260,6 +261,12 @@ const Permit = ({
               <ProtocolListItem protocol={requireData.protocol} />
             </SubRow>
           </SubCol>
+          <SubCol>
+            <SubRow isTitle>{t('page.signTx.hasInteraction')}</SubRow>
+            <SubRow>
+              <Values.Interacted value={requireData.hasInteraction} />
+            </SubRow>
+          </SubCol>
 
           {isInWhitelist && (
             <SubCol>

diff --git a/yarn.lock b/yarn.lock
@@ -4710,10 +4710,10 @@
     sinon-chrome "^3.0.1"
     webextension-polyfill "0.7.0"
 
-"@rabby-wallet/[email protected].3":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@rabby-wallet/rabby-action/-/rabby-action-0.1.3.tgz#729f495903afe212612b3e6616ca3684c10698e3"
-  integrity sha512-Y6S+c300rjdeSJf4+gz+9VVmDh91LWh9hIRTmWFLUEJO7dZakQJNiiGQ31DwiMzwTvHOMY4EL++Hs+IAQmXOyQ==
+"@rabby-wallet/[email protected].4":
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/@rabby-wallet/rabby-action/-/rabby-action-0.1.4.tgz#c82e7c8b538b7dfd94506c4f89f78aca7ca880ef"
+  integrity sha512-6ttnlpGHcO2v/qyYo8epBbSutfS9OZXfXr9mfapuveoBvzqUwvE6ej3bsmdtc+qFhFeH7HeiwASpY6xaTM4E1w==
 
 "@rabby-wallet/[email protected]":
   version "0.8.2"