Merge remote-tracking branch 'origin/feat/permit_2' into tmp/20240725

RabbyHub · Jul 26, 2024 · 7068c57 · 7068c57
2 parents fb94732 + 8208c5b
commit 7068c57
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/ui/views/ApprovalManagePage/index.tsx b/src/ui/views/ApprovalManagePage/index.tsx
@@ -292,8 +292,8 @@ function getColumnsForContract({
           return checkResult.keepRiskFirstReturnValue;
 
         return (
-          b.$riskAboutValues.risk_spend_usd_value -
-          a.$riskAboutValues.risk_spend_usd_value
+          a.$riskAboutValues.risk_spend_usd_value -
+          b.$riskAboutValues.risk_spend_usd_value
         );
       },
       sortOrder:

diff --git a/src/ui/views/ApprovalManagePage/utils.ts b/src/ui/views/ApprovalManagePage/utils.ts
@@ -118,6 +118,9 @@ export const findIndexRevokeList = <
         if (
           revoke.contractId === token.contract_id &&
           revoke.spender === token.spender.id &&
+          (!revoke.permit2Id ||
+            revoke.permit2Id ===
+              findContractMatchedSpender(token, item)?.permit2_id) &&
           revoke.tokenId === token.inner_id &&
           revoke.chainServerId === token.chain
         ) {
@@ -129,6 +132,9 @@ export const findIndexRevokeList = <
         if (
           revoke.contractId === token.contract_id &&
           revoke.spender === token.spender.id &&
+          (!revoke.permit2Id ||
+            revoke.permit2Id ===
+              findContractMatchedSpender(token, item)?.permit2_id) &&
           revoke.chainServerId === token.chain
         ) {
           return true;
@@ -138,6 +144,9 @@ export const findIndexRevokeList = <
       return list.findIndex((revoke) => {
         if (
           revoke.spender === item.id &&
+          (!revoke.permit2Id ||
+            revoke.permit2Id ===
+              findContractMatchedSpender(token, item)?.permit2_id) &&
           revoke.id === token.id &&
           revoke.chainServerId === item.chain
         ) {
@@ -149,7 +158,6 @@ export const findIndexRevokeList = <
     return list.findIndex((revoke) => {
       if (
         revoke.spender === (token as Spender).id &&
-        revoke.permit2Id === getFirstSpender(token)?.permit2_id &&
         revoke.id === item.id &&
         revoke.chainServerId === item.chain
       ) {