diff --git a/package.json b/package.json index 219bbf2281c..2855555d934 100644 --- a/package.json +++ b/package.json @@ -60,9 +60,9 @@ "@rabby-wallet/eth-watch-keyring": "1.0.0", "@rabby-wallet/gnosis-sdk": "1.3.8", "@rabby-wallet/page-provider": "0.4.0", - "@rabby-wallet/rabby-action": "^0.1.1-beta.3", + "@rabby-wallet/rabby-action": "0.1.2", "@rabby-wallet/rabby-api": "0.7.31", - "@rabby-wallet/rabby-security-engine": "2.0.7-beta", + "@rabby-wallet/rabby-security-engine": "2.0.7", "@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 index 403767384e1..f83aa03cea3 100644 --- a/src/ui/views/Approval/components/Actions/ApproveNFT.tsx +++ b/src/ui/views/Approval/components/Actions/ApproveNFT.tsx @@ -134,16 +134,6 @@ const ApproveNFT = ({ title={t('page.signTx.trustValueTitle')} /> - } - defaultText={ - - } - title={t('page.signTx.interacted')} - /> - - } - defaultText={ - - } - title={t('page.signTx.interacted')} - /> - - - {t('page.signTx.hasInteraction')} - - - - {isInWhitelist && ( {t('page.signTx.myMark')} {t('page.signTx.trusted')} )} + + + - - {t('page.signTx.hasInteraction')} - - - - {isInWhitelist && ( {t('page.signTx.myMark')} diff --git a/src/ui/views/Approval/components/Actions/CrossToken.tsx b/src/ui/views/Approval/components/Actions/CrossToken.tsx index fc38f9f9925..e830b695380 100644 --- a/src/ui/views/Approval/components/Actions/CrossToken.tsx +++ b/src/ui/views/Approval/components/Actions/CrossToken.tsx @@ -244,7 +244,6 @@ const Swap = ({ - - {t('page.signTx.hasInteraction')} - - - - {isInWhitelist && ( {t('page.signTx.myMark')} diff --git a/src/ui/views/Approval/components/Actions/MultiSwap.tsx b/src/ui/views/Approval/components/Actions/MultiSwap.tsx index 2731513a112..dbc164e1e74 100644 --- a/src/ui/views/Approval/components/Actions/MultiSwap.tsx +++ b/src/ui/views/Approval/components/Actions/MultiSwap.tsx @@ -193,13 +193,6 @@ const MultiSwap = ({ - - {t('page.signTx.hasInteraction')} - - - - - {isInWhitelist && ( {t('page.signTx.myMark')} diff --git a/src/ui/views/Approval/components/Actions/Swap.tsx b/src/ui/views/Approval/components/Actions/Swap.tsx index 27e097f14e7..d497d627770 100644 --- a/src/ui/views/Approval/components/Actions/Swap.tsx +++ b/src/ui/views/Approval/components/Actions/Swap.tsx @@ -303,7 +303,6 @@ const Swap = ({ - - {t('page.signTx.hasInteraction')} - - - - {isInWhitelist && ( {t('page.signTx.myMark')} diff --git a/src/ui/views/Approval/components/Actions/SwapLimitPay.tsx b/src/ui/views/Approval/components/Actions/SwapLimitPay.tsx index 23b3a357630..96f0929c80b 100644 --- a/src/ui/views/Approval/components/Actions/SwapLimitPay.tsx +++ b/src/ui/views/Approval/components/Actions/SwapLimitPay.tsx @@ -184,13 +184,6 @@ const SwapLimitPay = ({ - - {t('page.signTx.hasInteraction')} - - - - - {isInWhitelist && ( {t('page.signTx.myMark')} diff --git a/src/ui/views/Approval/components/Actions/TokenApprove.tsx b/src/ui/views/Approval/components/Actions/TokenApprove.tsx index 2615941d96b..9e926e531bd 100644 --- a/src/ui/views/Approval/components/Actions/TokenApprove.tsx +++ b/src/ui/views/Approval/components/Actions/TokenApprove.tsx @@ -319,16 +319,6 @@ const TokenApprove = ({ title={t('page.signTx.trustValueTitle')} /> - } - defaultText={ - - } - /> - - - {t('page.signTx.hasInteraction')} - - - - {isInWhitelist && ( {t('page.signTx.myMark')} diff --git a/src/ui/views/Approval/components/Actions/WrapToken.tsx b/src/ui/views/Approval/components/Actions/WrapToken.tsx index 226345b3918..ad13cd458af 100644 --- a/src/ui/views/Approval/components/Actions/WrapToken.tsx +++ b/src/ui/views/Approval/components/Actions/WrapToken.tsx @@ -183,7 +183,6 @@ const WrapToken = ({ - - {t('page.signTx.hasInteraction')} - - - - {isInWhitelist && ( diff --git a/src/ui/views/Approval/components/Actions/components/ViewMorePopup/ContractPopup.tsx b/src/ui/views/Approval/components/Actions/components/ViewMorePopup/ContractPopup.tsx index 34252da426f..a893ad65372 100644 --- a/src/ui/views/Approval/components/Actions/components/ViewMorePopup/ContractPopup.tsx +++ b/src/ui/views/Approval/components/Actions/components/ViewMorePopup/ContractPopup.tsx @@ -13,7 +13,6 @@ interface ContractData { name: string; logo_url: string; } | null; - hasInteraction: boolean; bornAt: number | null; rank: number | null; title?: string; @@ -64,12 +63,6 @@ export const ContractPopup: React.FC = ({ data }) => { - - {t('page.signTx.interacted')} - - - - {t('page.signTx.deployTimeTitle')} diff --git a/src/ui/views/Approval/components/Actions/components/ViewMorePopup/NFTSpenderPopup.tsx b/src/ui/views/Approval/components/Actions/components/ViewMorePopup/NFTSpenderPopup.tsx index 8c22a0a24c6..b559a6749c2 100644 --- a/src/ui/views/Approval/components/Actions/components/ViewMorePopup/NFTSpenderPopup.tsx +++ b/src/ui/views/Approval/components/Actions/components/ViewMorePopup/NFTSpenderPopup.tsx @@ -13,7 +13,6 @@ interface NFTSpenderData { name: string; logo_url: string; } | null; - hasInteraction: boolean; bornAt: number | null; rank: number | null; riskExposure: number; @@ -107,12 +106,6 @@ export const NFTSpenderPopup: React.FC = ({ data }) => { : '-'} - - {t('page.signTx.interacted')} - - - - {t('page.signTx.addressNote')} diff --git a/src/ui/views/Approval/components/Actions/components/ViewMorePopup/SpenderPopup.tsx b/src/ui/views/Approval/components/Actions/components/ViewMorePopup/SpenderPopup.tsx index 1797dbc8cef..b9a1d35dee6 100644 --- a/src/ui/views/Approval/components/Actions/components/ViewMorePopup/SpenderPopup.tsx +++ b/src/ui/views/Approval/components/Actions/components/ViewMorePopup/SpenderPopup.tsx @@ -13,7 +13,6 @@ interface SpenderData { name: string; logo_url: string; } | null; - hasInteraction: boolean; bornAt: number | null; rank: number | null; riskExposure: number; @@ -107,12 +106,6 @@ export const SpenderPopup: React.FC = ({ data }) => { : '-'} - - {t('page.signTx.interacted')} - - - - {t('page.signTx.addressNote')} diff --git a/src/ui/views/Approval/components/CommonAction.tsx b/src/ui/views/Approval/components/CommonAction.tsx index d23b8ce6131..b92bc5e35b4 100644 --- a/src/ui/views/Approval/components/CommonAction.tsx +++ b/src/ui/views/Approval/components/CommonAction.tsx @@ -82,7 +82,6 @@ export const CommonAction = ({ - - {t('page.signTx.hasInteraction')} - - - - - {isInWhitelist && ( {t('page.signTx.myMark')} diff --git a/src/ui/views/Approval/components/TypedDataActions/BatchPermit2.tsx b/src/ui/views/Approval/components/TypedDataActions/BatchPermit2.tsx index 4751bb2bd05..6af252238a9 100644 --- a/src/ui/views/Approval/components/TypedDataActions/BatchPermit2.tsx +++ b/src/ui/views/Approval/components/TypedDataActions/BatchPermit2.tsx @@ -172,16 +172,6 @@ const Permit2 = ({ title={t('page.signTx.trustValueTitle')} /> - } - defaultText={ - - } - title={t('page.signTx.interacted')} - /> - - - {t('page.signTx.hasInteraction')} - - - - {isInWhitelist && ( {t('page.signTx.myMark')} diff --git a/src/ui/views/Approval/components/TypedDataActions/Permit.tsx b/src/ui/views/Approval/components/TypedDataActions/Permit.tsx index 2d1b2ae8e8d..7401620538e 100644 --- a/src/ui/views/Approval/components/TypedDataActions/Permit.tsx +++ b/src/ui/views/Approval/components/TypedDataActions/Permit.tsx @@ -147,16 +147,6 @@ const Permit = ({ title={t('page.signTx.trustValueTitle')} /> - } - defaultText={ - - } - title={t('page.signTx.interacted')} - /> - - } - defaultText={ - - } - title={t('page.signTx.interacted')} - /> - - - {t('page.signTx.hasInteraction')} - - - - + {isInWhitelist && ( {t('page.signTx.myMark')} diff --git a/yarn.lock b/yarn.lock index c799ffbad87..23ad85d6fbc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4738,12 +4738,10 @@ sinon-chrome "^3.0.1" webextension-polyfill "0.7.0" -"@rabby-wallet/rabby-action@^0.1.1-beta.3": - version "0.1.1-beta.3" - resolved "https://registry.yarnpkg.com/@rabby-wallet/rabby-action/-/rabby-action-0.1.1-beta.3.tgz#1c05175e977a00e4961934dcc7982cf2e470936b" - integrity sha512-E/RoD1KthA4a1XXi3gqH5VEyT8lA8+dOlk6UaeajNfgs52f2sjSfTWmUT+mKAQxTgbLy9IQJHoFW0tXh37dc9Q== - dependencies: - p-queue "^8.0.1" +"@rabby-wallet/rabby-action@0.1.2": + version "0.1.2" + resolved "https://registry.yarnpkg.com/@rabby-wallet/rabby-action/-/rabby-action-0.1.2.tgz#f4a40d0fb3d476c38fc5d277776e2f43edd7dfa8" + integrity sha512-6V1+oaFxanXBmBSK8yQ9EFMKXl3sZ4IjftqAbixiTraGVv9EPDnLboC3R9APCHYhfXDiC3tf0VE4bhnw3SESSg== "@rabby-wallet/rabby-api@0.7.31": @@ -4758,10 +4756,10 @@ lodash "^4.17.21" qss "^2.0.3" -"@rabby-wallet/rabby-security-engine@2.0.7-beta": - version "2.0.7-beta" - resolved "https://registry.yarnpkg.com/@rabby-wallet/rabby-security-engine/-/rabby-security-engine-2.0.7-beta.tgz#bcdb303001b18ad04c9553270ceb0f1cf816a8bd" - integrity sha512-orojIPjBDCvvaB8sCAICfVLStLiEIRrJCe22jH8za849cwWeoAz8QeiRGC85GzpEnvcTp1icjHk/uLv2fGc97g== +"@rabby-wallet/rabby-security-engine@2.0.7": + version "2.0.7" + resolved "https://registry.yarnpkg.com/@rabby-wallet/rabby-security-engine/-/rabby-security-engine-2.0.7.tgz#0d90e7ebdec46bd03a498d27b04f02a30e33cb39" + integrity sha512-cv400257wR43+6EiDaqQNS8fzamRNnuNvFfTw3UvgC2TnD9JPhdplqDcN4e8imqs6UW5NDoy3VAbvyajzbzvIw== "@rabby-wallet/rabby-sign@^0.3.3": version "0.3.3" @@ -10734,11 +10732,6 @@ eventemitter3@^4.0.0, eventemitter3@^4.0.1, eventemitter3@^4.0.7: resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== -eventemitter3@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.1.tgz#53f5ffd0a492ac800721bb42c66b841de96423c4" - integrity sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA== - events@3.3.0, events@^3.0.0, events@^3.2.0, events@^3.3.0: version "3.3.0" resolved "https://r.cnpmjs.org/events/download/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" @@ -14660,14 +14653,6 @@ p-queue@7.3.0: eventemitter3 "^4.0.7" p-timeout "^5.0.2" -p-queue@^8.0.1: - version "8.0.1" - resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-8.0.1.tgz#718b7f83836922ef213ddec263ff4223ce70bef8" - integrity sha512-NXzu9aQJTAzbBqOt2hwsR63ea7yvxJc0PwN/zobNAudYfb1B7R08SzB4TsLeSbUCuG467NhnoT0oO6w1qRO+BA== - dependencies: - eventemitter3 "^5.0.1" - p-timeout "^6.1.2" - p-retry@5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-5.1.2.tgz#c16eaee4f2016f9161d12da40d3b8b0f2e3c1b76" @@ -14689,11 +14674,6 @@ p-timeout@^5.0.2: resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-5.1.0.tgz#b3c691cf4415138ce2d9cfe071dba11f0fee085b" integrity sha512-auFDyzzzGZZZdHz3BtET9VEz0SE/uMEAx7uWfGPucfzEwwe/xH0iVeZibQmANYE/hp9T2+UUZT5m+BKyrDp3Ew== -p-timeout@^6.1.2: - version "6.1.2" - resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-6.1.2.tgz#22b8d8a78abf5e103030211c5fc6dee1166a6aa5" - integrity sha512-UbD77BuZ9Bc9aABo74gfXhNvzC9Tx7SxtHSh1fxvx3jTLLYvmVhiQZZrJzqqU0jKbN32kb5VOKiLEQI/3bIjgQ== - p-try@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"