From 987a0d61da25a0153c4d9a1f9504108d56b5a71f Mon Sep 17 00:00:00 2001 From: Angelia Date: Thu, 12 Dec 2024 18:47:18 +0800 Subject: [PATCH 1/3] fix: PORTAL-3572 --- packages/popup/src/pages/ResendTransaction/index.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/popup/src/pages/ResendTransaction/index.js b/packages/popup/src/pages/ResendTransaction/index.js index b0882559..cafc642f 100644 --- a/packages/popup/src/pages/ResendTransaction/index.js +++ b/packages/popup/src/pages/ResendTransaction/index.js @@ -154,7 +154,12 @@ function ResendTransaction() { } = originEstimateRst const originEstimateGasPrice = useMemo(() => { - if (loading || Object.keys(originEstimateRst).length === 0) return null + if ( + loading || + (!isTxTreatedAsEIP1559 && !estimateGasPrice) || + (isTxTreatedAsEIP1559 && !gasInfoEip1559?.['medium']) + ) + return null return !isTxTreatedAsEIP1559 ? estimateGasPrice : convertDecimal( From 2a708612c76b1d140bba8ac5f0c83268938fdd8f Mon Sep 17 00:00:00 2001 From: Angelia Date: Thu, 12 Dec 2024 18:47:55 +0800 Subject: [PATCH 2/3] chore: update version --- .yarn/versions/117003c2.yml | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .yarn/versions/117003c2.yml diff --git a/.yarn/versions/117003c2.yml b/.yarn/versions/117003c2.yml new file mode 100644 index 00000000..6cc5c675 --- /dev/null +++ b/.yarn/versions/117003c2.yml @@ -0,0 +1,2 @@ +declined: + - helios-popup From 9c3aa668cb4648538d2764ffd42b3c9e26e1053c Mon Sep 17 00:00:00 2001 From: Angelia Date: Thu, 12 Dec 2024 18:50:27 +0800 Subject: [PATCH 3/3] chore: update version --- .yarn/versions/117003c2.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.yarn/versions/117003c2.yml b/.yarn/versions/117003c2.yml index 6cc5c675..28d0e242 100644 --- a/.yarn/versions/117003c2.yml +++ b/.yarn/versions/117003c2.yml @@ -1,2 +1,3 @@ declined: + - helios - helios-popup