LaconicNetwork/dydx-v4-web
6
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

use updated isaccountconnected check (#268)

Browse Source 
* use updated isaccountconnected check

* address feedback
This commit is contained in:
aleka 2024-02-02 15:12:52 -05:00 committed by GitHub
parent 7d30c80320
commit f79c062808
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/hooks/useWalletConnection.ts
View File

@ -115,7 +115,15 @@ export const useWalletConnection = () => {
});
const connectWallet = useCallback(
async ({ walletType, forceConnect }: { walletType?: WalletType; forceConnect?: boolean }) => {
async ({
walletType,
forceConnect,
isAccountConnected,
}: {
walletType?: WalletType;
forceConnect?: boolean;
isAccountConnected?: boolean;
}) => {
if (!walletType) return { walletType, walletConnectionType };
const walletConnection = getWalletConnection({ walletType });
@ -143,9 +151,6 @@ export const useWalletConnection = () => {
} else if (walletConnection.type === WalletConnectionType.TestWallet) {
saveEvmAddress(STRING_KEYS.TEST_WALLET as EvmAddress);
} else {
const isAccountConnected = Boolean(
evmAddress && evmDerivedAddresses[evmAddress]?.encryptedSignature
);
// if account connected (via remember me), do not show wagmi popup until forceConnect
if (!isConnectedWagmi && (forceConnect || !isAccountConnected)) {
await connectWagmi({
@ -195,6 +200,9 @@ export const useWalletConnection = () => {
try {
const { walletType, walletConnectionType } = await connectWallet({
walletType: selectedWalletType,
isAccountConnected: Boolean(
evmAddress && evmDerivedAddresses[evmAddress]?.encryptedSignature
),
});
setWalletType(walletType);
@ -217,7 +225,7 @@ export const useWalletConnection = () => {
await disconnectWallet();
}
})();
}, [selectedWalletType, signerWagmi, signerGraz]);
}, [selectedWalletType, signerWagmi, signerGraz, evmDerivedAddresses, evmAddress]);
const selectWalletType = async (walletType: WalletType | undefined) => {
if (selectedWalletType) {