From 4480b3e091b4d2740a8d3a59e1cddb6b77d7c62f Mon Sep 17 00:00:00 2001
From: nuanyang233 <528944303@qq.com>
Date: Thu, 10 Feb 2022 14:25:01 +0800
Subject: [PATCH 1/2] fix: adjust ens link content

---
 .../components/Transfer/TransferERC20.tsx      | 16 ++++++++--------
 .../components/Transfer/TransferERC721.tsx     | 16 ++++++++--------
 .../pages/Wallet/Transfer/Transfer1559.tsx     | 18 +++++++++---------
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC20.tsx b/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC20.tsx
index 2a9465572686..99d7881d7078 100644
--- a/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC20.tsx
+++ b/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC20.tsx
@@ -176,12 +176,12 @@ export const TransferERC20 = memo<TransferERC20Props>(({ token }) => {
         if (resolveDomainLoading) return
         if (registeredAddress) {
             return (
-                <Link
-                    href={Utils?.resolveDomainLink?.(address)}
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    underline="none">
-                    <Box style={{ padding: 10 }}>
+                <Box style={{ padding: 10 }}>
+                    <Link
+                        href={Utils?.resolveDomainLink?.(address)}
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        underline="none">
                         <Typography
                             fontSize={16}
                             lineHeight="22px"
@@ -193,8 +193,8 @@ export const TransferERC20 = memo<TransferERC20Props>(({ token }) => {
                         <Typography fontSize={14} lineHeight="20px" style={{ color: MaskColorVar.textSecondary }}>
                             <FormattedAddress address={registeredAddress} size={4} formatter={Utils?.formatAddress} />
                         </Typography>
-                    </Box>
-                </Link>
+                    </Link>
+                </Box>
             )
         }
 
diff --git a/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC721.tsx b/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC721.tsx
index b17608ce430a..61be82825afd 100644
--- a/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC721.tsx
+++ b/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC721.tsx
@@ -226,12 +226,12 @@ export const TransferERC721 = memo(() => {
         if (resolveDomainLoading) return
         if (registeredAddress) {
             return (
-                <Link
-                    href={Utils?.resolveDomainLink?.(allFormFields.recipient)}
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    underline="none">
-                    <Box style={{ padding: 10 }}>
+                <Box style={{ padding: 10 }}>
+                    <Link
+                        href={Utils?.resolveDomainLink?.(allFormFields.recipient)}
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        underline="none">
                         <Typography
                             fontSize={16}
                             lineHeight="22px"
@@ -242,8 +242,8 @@ export const TransferERC721 = memo(() => {
                         <Typography fontSize={14} lineHeight="20px" style={{ color: MaskColorVar.textSecondary }}>
                             <FormattedAddress address={registeredAddress} size={4} formatter={Utils?.formatAddress} />
                         </Typography>
-                    </Box>
-                </Link>
+                    </Link>
+                </Box>
             )
         }
 
diff --git a/packages/mask/src/extension/popups/pages/Wallet/Transfer/Transfer1559.tsx b/packages/mask/src/extension/popups/pages/Wallet/Transfer/Transfer1559.tsx
index 495d76d7062f..4c96a165c8e9 100644
--- a/packages/mask/src/extension/popups/pages/Wallet/Transfer/Transfer1559.tsx
+++ b/packages/mask/src/extension/popups/pages/Wallet/Transfer/Transfer1559.tsx
@@ -455,12 +455,12 @@ export const Transfer1559 = memo<Transfer1559Props>(({ selectedAsset, openAssetM
 
         if (registeredAddress && !resolveDomainError && Utils?.resolveDomainLink)
             return (
-                <Link
-                    href={Utils.resolveDomainLink(address)}
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    underline="none">
-                    <Box display="flex" justifyContent="space-between" alignItems="center" py={2.5} px={1.5}>
+                <Box display="flex" justifyContent="space-between" alignItems="center" py={2.5} px={1.5}>
+                    <Link
+                        href={Utils.resolveDomainLink(address)}
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        underline="none">
                         <Box>
                             <Typography className={classes.domainName}>{address}</Typography>
                             <Typography className={classes.registeredAddress}>
@@ -471,9 +471,9 @@ export const Transfer1559 = memo<Transfer1559Props>(({ selectedAsset, openAssetM
                                 />
                             </Typography>
                         </Box>
-                        <RightIcon />
-                    </Box>
-                </Link>
+                    </Link>
+                    <RightIcon />
+                </Box>
             )
 
         return

From bc80ddb7c8ed9ec0abb93c7c3f37ad017fbe87f0 Mon Sep 17 00:00:00 2001
From: nuanyang233 <528944303@qq.com>
Date: Thu, 10 Feb 2022 15:08:15 +0800
Subject: [PATCH 2/2] fix: add margin gas when calculating maxAmount

---
 .../src/pages/Wallets/components/Transfer/TransferERC20.tsx   | 3 ++-
 .../extension/popups/pages/Wallet/Transfer/Transfer1559.tsx   | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC20.tsx b/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC20.tsx
index 99d7881d7078..0eaae705acd2 100644
--- a/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC20.tsx
+++ b/packages/dashboard/src/pages/Wallets/components/Transfer/TransferERC20.tsx
@@ -2,6 +2,7 @@ import { MaskColorVar, MaskTextField } from '@masknet/theme'
 import { Box, Button, IconButton, Link, Popover, Stack, Typography } from '@mui/material'
 import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import {
+    addGasMargin,
     EthereumTokenType,
     formatWeiToEther,
     FungibleTokenDetailed,
@@ -110,7 +111,7 @@ export const TransferERC20 = memo<TransferERC20Props>(({ token }) => {
 
     const gasFee = useMemo(() => {
         const price = is1559Supported && maxFee ? new BigNumber(maxFee) : gasPrice
-        return multipliedBy(gasLimit, price)
+        return multipliedBy(addGasMargin(gasLimit), price)
     }, [gasLimit, gasPrice, maxFee, is1559Supported])
     const gasFeeInUsd = formatWeiToEther(gasFee).multipliedBy(nativeTokenPrice)
 
diff --git a/packages/mask/src/extension/popups/pages/Wallet/Transfer/Transfer1559.tsx b/packages/mask/src/extension/popups/pages/Wallet/Transfer/Transfer1559.tsx
index 4c96a165c8e9..a77cdd03d5b4 100644
--- a/packages/mask/src/extension/popups/pages/Wallet/Transfer/Transfer1559.tsx
+++ b/packages/mask/src/extension/popups/pages/Wallet/Transfer/Transfer1559.tsx
@@ -1,6 +1,7 @@
 import { memo, ReactElement, SyntheticEvent, useCallback, useMemo, useRef, useState } from 'react'
 import { useI18N } from '../../../../../utils'
 import {
+    addGasMargin,
     Asset,
     EthereumTokenType,
     formatBalance,
@@ -364,7 +365,8 @@ export const Transfer1559 = memo<Transfer1559Props>(({ selectedAsset, openAssetM
     )
 
     const maxAmount = useMemo(() => {
-        const gasFee = formatGweiToWei(maxFeePerGas ?? 0).multipliedBy(MIN_GAS_LIMIT)
+        const gasFee = formatGweiToWei(new BigNumber(maxFeePerGas ?? 0)).multipliedBy(addGasMargin(MIN_GAS_LIMIT))
+
         let amount_ = new BigNumber(tokenBalance ?? 0)
         amount_ = selectedAsset?.token.type === EthereumTokenType.Native ? amount_.minus(gasFee) : amount_
         return formatBalance(amount_.toFixed(), selectedAsset?.token.decimals)