feat: rule for trust value is zero (#2480)

* feat: rule for trust value is zero * fix: update
RabbyHub · Aug 23, 2024 · 582144d · 582144d
1 parent caf1d6b
commit 582144d
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 70 deletions.
diff --git a/package.json b/package.json
@@ -61,7 +61,7 @@
     "@rabby-wallet/gnosis-sdk": "1.3.8",
     "@rabby-wallet/page-provider": "0.4.0",
     "@rabby-wallet/rabby-api": "0.7.26",
-    "@rabby-wallet/rabby-security-engine": "2.0.5",
+    "@rabby-wallet/rabby-security-engine": "^2.0.6-beta.1",
     "@rabby-wallet/rabby-swap": "0.0.39",
     "@rabby-wallet/widgets": "1.0.9",
     "@rematch/core": "2.2.0",

diff --git a/src/ui/views/Approval/components/Actions/ApproveNFT.tsx b/src/ui/views/Approval/components/Actions/ApproveNFT.tsx
@@ -123,6 +123,14 @@ const ApproveNFT = ({
             title={t('page.signTx.addressTypeTitle')}
           />
 
+          <SecurityListItem
+            tip={t('page.signTx.tokenApprove.contractTrustValueTip')}
+            id="1147"
+            engineResult={engineResultMap['1147']}
+            warningText={'$0'}
+            title={t('page.signTx.trustValueTitle')}
+          />
+
           <SecurityListItem
             id="1048"
             engineResult={engineResultMap['1048']}

diff --git a/src/ui/views/Approval/components/Actions/ApproveNFTCollection.tsx b/src/ui/views/Approval/components/Actions/ApproveNFTCollection.tsx
@@ -127,6 +127,14 @@ const ApproveNFTCollection = ({
             title={t('page.signTx.addressTypeTitle')}
           />
 
+          <SecurityListItem
+            tip={t('page.signTx.tokenApprove.contractTrustValueTip')}
+            id="1146"
+            engineResult={engineResultMap['1146']}
+            warningText={'$0'}
+            title={t('page.signTx.trustValueTitle')}
+          />
+
           <SecurityListItem
             id="1056"
             engineResult={engineResultMap['1056']}
@@ -137,19 +145,6 @@ const ApproveNFTCollection = ({
             title={t('page.signTx.interacted')}
           />
 
-          <SecurityListItem
-            tip={t('page.signTx.nftApprove.nftContractTrustValueTip')}
-            id="1054"
-            engineResult={engineResultMap['1054']}
-            dangerText={t('page.signTx.tokenApprove.trustValueLessThan', {
-              value: '$10,000',
-            })}
-            warningText={t('page.signTx.tokenApprove.trustValueLessThan', {
-              value: '$100,000',
-            })}
-            title={t('page.signTx.trustValueTitle')}
-          />
-
           <SecurityListItem
             id="1055"
             engineResult={engineResultMap['1055']}

diff --git a/src/ui/views/Approval/components/Actions/TokenApprove.tsx b/src/ui/views/Approval/components/Actions/TokenApprove.tsx
@@ -308,6 +308,14 @@ const TokenApprove = ({
             title={t('page.signTx.addressTypeTitle')}
           />
 
+          <SecurityListItem
+            tip={t('page.signTx.tokenApprove.contractTrustValueTip')}
+            id="1150"
+            engineResult={engineResultMap['1150']}
+            warningText={'$0'}
+            title={t('page.signTx.trustValueTitle')}
+          />
+
           <SecurityListItem
             id="1025"
             title={t('page.signTx.interacted')}
@@ -318,19 +326,6 @@ const TokenApprove = ({
             }
           />
 
-          <SecurityListItem
-            tip={t('page.signTx.tokenApprove.contractTrustValueTip')}
-            id="1023"
-            engineResult={engineResultMap['1023']}
-            dangerText={t('page.signTx.tokenApprove.trustValueLessThan', {
-              value: '$10,000',
-            })}
-            warningText={t('page.signTx.tokenApprove.trustValueLessThan', {
-              value: '$50,000',
-            })}
-            title={t('page.signTx.trustValueTitle')}
-          />
-
           <SecurityListItem
             id="1024"
             engineResult={engineResultMap['1024']}

diff --git a/src/ui/views/Approval/components/TypedDataActions/BatchPermit2.tsx b/src/ui/views/Approval/components/TypedDataActions/BatchPermit2.tsx
@@ -161,6 +161,14 @@ const Permit2 = ({
             title={t('page.signTx.addressTypeTitle')}
           />
 
+          <SecurityListItem
+            tip={t('page.signTx.tokenApprove.contractTrustValueTip')}
+            id="1145"
+            engineResult={engineResultMap['1145']}
+            warningText={'$0'}
+            title={t('page.signTx.trustValueTitle')}
+          />
+
           <SecurityListItem
             id="1112"
             engineResult={engineResultMap['1112']}
@@ -171,19 +179,6 @@ const Permit2 = ({
             title={t('page.signTx.interacted')}
           />
 
-          <SecurityListItem
-            tip={t('page.signTx.tokenApprove.contractTrustValueTip')}
-            id="1110"
-            engineResult={engineResultMap['1110']}
-            dangerText={t('page.signTx.tokenApprove.trustValueLessThan', {
-              value: '$10,000',
-            })}
-            warningText={t('page.signTx.tokenApprove.trustValueLessThan', {
-              value: '$100,000',
-            })}
-            title={t('page.signTx.trustValueTitle')}
-          />
-
           <SecurityListItem
             id="1111"
             engineResult={engineResultMap['1111']}

diff --git a/src/ui/views/Approval/components/TypedDataActions/Permit.tsx b/src/ui/views/Approval/components/TypedDataActions/Permit.tsx
@@ -138,6 +138,14 @@ const Permit = ({
             title={t('page.signTx.addressTypeTitle')}
           />
 
+          <SecurityListItem
+            tip={t('page.signTx.tokenApprove.contractTrustValueTip')}
+            id="1148"
+            engineResult={engineResultMap['1148']}
+            warningText={'$0'}
+            title={t('page.signTx.trustValueTitle')}
+          />
+
           <SecurityListItem
             id="1080"
             engineResult={engineResultMap['1080']}
@@ -148,19 +156,6 @@ const Permit = ({
             title={t('page.signTx.interacted')}
           />
 
-          <SecurityListItem
-            tip={t('page.signTx.tokenApprove.contractTrustValueTip')}
-            id="1078"
-            engineResult={engineResultMap['1078']}
-            dangerText={t('page.signTx.tokenApprove.trustValueLessThan', {
-              value: '$10,000',
-            })}
-            warningText={t('page.signTx.tokenApprove.trustValueLessThan', {
-              value: '$100,000',
-            })}
-            title={t('page.signTx.trustValueTitle')}
-          />
-
           <SecurityListItem
             id="1079"
             engineResult={engineResultMap['1079']}

diff --git a/src/ui/views/Approval/components/TypedDataActions/Permit2.tsx b/src/ui/views/Approval/components/TypedDataActions/Permit2.tsx
@@ -150,6 +150,14 @@ const Permit2 = ({
             title={t('page.signTx.addressTypeTitle')}
           />
 
+          <SecurityListItem
+            tip={t('page.signTx.tokenApprove.contractTrustValueTip')}
+            id="1149"
+            engineResult={engineResultMap['1149']}
+            warningText={'$0'}
+            title={t('page.signTx.trustValueTitle')}
+          />
+
           <SecurityListItem
             id="1074"
             engineResult={engineResultMap['1074']}
@@ -160,19 +168,6 @@ const Permit2 = ({
             title={t('page.signTx.interacted')}
           />
 
-          <SecurityListItem
-            tip={t('page.signTx.tokenApprove.contractTrustValueTip')}
-            id="1072"
-            engineResult={engineResultMap['1072']}
-            dangerText={t('page.signTx.tokenApprove.trustValueLessThan', {
-              value: '$10,000',
-            })}
-            warningText={t('page.signTx.tokenApprove.trustValueLessThan', {
-              value: '$100,000',
-            })}
-            title={t('page.signTx.trustValueTitle')}
-          />
-
           <SecurityListItem
             id="1073"
             engineResult={engineResultMap['1073']}

diff --git a/yarn.lock b/yarn.lock
@@ -4750,10 +4750,10 @@
     lodash "^4.17.21"
     qss "^2.0.3"
 
-"@rabby-wallet/rabby-security-engine@2.0.5":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@rabby-wallet/rabby-security-engine/-/rabby-security-engine-2.0.5.tgz#600fbeb0893d7c534f5595bf27171f755b0c0f48"
-  integrity sha512-A2LmtEeWXriYjLRWT2P4mE2mAUZZjj9uImfinNcAvhF8xW0RNHRotiyakf+EFQTvutgcy1JrqAJJHvJtQIA7Rw==
+"@rabby-wallet/rabby-security-engine@^2.0.6-beta.1":
+  version "2.0.6-beta.1"
+  resolved "https://registry.yarnpkg.com/@rabby-wallet/rabby-security-engine/-/rabby-security-engine-2.0.6-beta.1.tgz#9d52440c873d13798b4f5697a7144445de473d69"
+  integrity sha512-CtWQrl5QjRRq6ylnhv1xfXknBRGL/wfDIU5rSzfs3zkAvEmZ4USmxdaKWktLEvrTm1hZDucJVeC5iLSUbYFnwQ==
 
 "@rabby-wallet/rabby-sign@^0.3.3":
   version "0.3.3"