fix: bugfix for select wallet (#10598)

* fix: bugfix for select wallet * fix: hidden switch network when wallet be smart pay --------- Co-authored-by: guanbinrui <52657989+guanbinrui@users.noreply.github.com>
DimensionDev · Aug 23, 2023 · 95d6edc · 95d6edc
1 parent 174a6cf
commit 95d6edc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/packages/mask/src/extension/popups/pages/Wallet/SelectWallet/index.tsx b/packages/mask/src/extension/popups/pages/Wallet/SelectWallet/index.tsx
@@ -159,7 +159,9 @@ const SelectWallet = memo(function SelectWallet() {
                     fullWidth
                     onClick={handleConfirm}
                     disabled={
-                        isVerifyWalletFlow ? !!bindingWallets?.some((x) => isSameAddress(x.identity, selected)) : false
+                        isVerifyWalletFlow
+                            ? !!wallets?.some((x) => isSameAddress(x.address, selected) && !!x.owner)
+                            : false
                     }>
                     {t('confirm')}
                 </ActionButton>

diff --git a/packages/mask/src/extension/popups/pages/Wallet/WalletSettings/index.tsx b/packages/mask/src/extension/popups/pages/Wallet/WalletSettings/index.tsx
@@ -56,8 +56,12 @@ const WalletSettings = memo(() => {
                 <AutoLock />
                 <ChangeCurrency />
                 <ChangePaymentPassword />
-                {wallet.owner ? null : <ShowPrivateKey />}
-                <ChangeNetwork />
+                {wallet.owner ? null : (
+                    <>
+                        <ShowPrivateKey />
+                        <ChangeNetwork />
+                    </>
+                )}
             </List>
             <Box className={classes.bottomAction}>
                 <ActionButton