Skip to content

Commit 2270849

Browse files
committed
Clear address
1 parent 32cf28b commit 2270849

8 files changed

Lines changed: 15 additions & 5 deletions

src/hooks/login/useCrossWindowLogin.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ export const useCrossWindowLogin = ({
5656
skipLoginMethod: LoginMethodsEnum.crossWindow
5757
});
5858

59+
dispatch(setAddress(emptyAccount.address));
5960
dispatch(setAccount(emptyAccount));
6061

6162
setIsLoading(true);

src/hooks/login/useExtensionLogin.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { SECOND_LOGIN_ATTEMPT_ERROR } from 'constants/errorsMessages';
55
import { setAccountProvider } from 'providers/accountProvider';
66
import { loginAction } from 'reduxStore/commonActions';
77
import { useDispatch } from 'reduxStore/DappProviderContext';
8-
import { emptyAccount, setAccount } from 'reduxStore/slices';
8+
import { emptyAccount, setAccount, setAddress } from 'reduxStore/slices';
99
import {
1010
InitiateLoginFunctionType,
1111
LoginHookGenericStateType,
@@ -45,6 +45,7 @@ export const useExtensionLogin = ({
4545
}
4646

4747
clearInitiatedLogins();
48+
dispatch(setAddress(emptyAccount.address));
4849
dispatch(setAccount(emptyAccount));
4950

5051
setIsLoading(true);

src/hooks/login/useIframeLogin.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { setAccountProvider } from 'providers/accountProvider';
99
import { loginAction } from 'reduxStore/commonActions';
1010
import { useDispatch, useSelector } from 'reduxStore/DappProviderContext';
1111
import { networkSelector } from 'reduxStore/selectors/networkConfigSelectors';
12-
import { emptyAccount, setAccount } from 'reduxStore/slices';
12+
import { emptyAccount, setAccount, setAddress } from 'reduxStore/slices';
1313
import {
1414
LoginHookGenericStateType,
1515
LoginMethodsEnum,
@@ -53,6 +53,7 @@ export const useIframeLogin = ({
5353
skipLoginMethod: LoginMethodsEnum.iframe
5454
});
5555

56+
dispatch(setAddress(emptyAccount.address));
5657
dispatch(setAccount(emptyAccount));
5758

5859
setIsLoading(true);

src/hooks/login/useLedgerLogin.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import { ledgerAccountSelector } from 'reduxStore/selectors';
99
import {
1010
emptyAccount,
1111
setAccount,
12+
setAddress,
1213
setLedgerAccount,
1314
setLedgerLogin,
1415
updateLedgerAccount
@@ -283,6 +284,7 @@ export const useLedgerLogin = ({
283284
}
284285

285286
clearInitiatedLogins();
287+
dispatch(setAddress(emptyAccount.address));
286288
dispatch(setAccount(emptyAccount));
287289
setError('');
288290

src/hooks/login/useMetamaskLogin.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { SECOND_LOGIN_ATTEMPT_ERROR } from 'constants/errorsMessages';
55
import { setAccountProvider } from 'providers/accountProvider';
66
import { loginAction } from 'reduxStore/commonActions';
77
import { useDispatch } from 'reduxStore/DappProviderContext';
8-
import { emptyAccount, setAccount } from 'reduxStore/slices';
8+
import { emptyAccount, setAccount, setAddress } from 'reduxStore/slices';
99
import {
1010
InitiateLoginFunctionType,
1111
LoginHookGenericStateType,
@@ -45,6 +45,7 @@ export const useMetamaskLogin = ({
4545
}
4646

4747
clearInitiatedLogins();
48+
dispatch(setAddress(emptyAccount.address));
4849
dispatch(setAccount(emptyAccount));
4950

5051
setIsLoading(true);

src/hooks/login/useOperaLogin.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { SECOND_LOGIN_ATTEMPT_ERROR } from 'constants/errorsMessages';
55
import { setAccountProvider } from 'providers/accountProvider';
66
import { loginAction } from 'reduxStore/commonActions';
77
import { useDispatch } from 'reduxStore/DappProviderContext';
8-
import { emptyAccount, setAccount } from 'reduxStore/slices';
8+
import { emptyAccount, setAccount, setAddress } from 'reduxStore/slices';
99
import {
1010
InitiateLoginFunctionType,
1111
LoginHookGenericStateType,
@@ -45,6 +45,7 @@ export const useOperaLogin = ({
4545
}
4646

4747
clearInitiatedLogins();
48+
dispatch(setAddress(emptyAccount.address));
4849
dispatch(setAccount(emptyAccount));
4950

5051
setIsLoading(true);

src/hooks/login/usePasskeyLogin.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { useGetNetworkConfig } from 'hooks/useGetNetworkConfig';
55
import { setAccountProvider } from 'providers/accountProvider';
66
import { loginAction } from 'reduxStore/commonActions';
77
import { useDispatch } from 'reduxStore/DappProviderContext';
8-
import { emptyAccount, setAccount } from 'reduxStore/slices';
8+
import { emptyAccount, setAccount, setAddress } from 'reduxStore/slices';
99
import {
1010
InitiateLoginFunctionType,
1111
LoginHookGenericStateType,
@@ -53,6 +53,7 @@ export const usePasskeyLogin = ({
5353
}
5454

5555
clearInitiatedLogins();
56+
dispatch(setAddress(emptyAccount.address));
5657
dispatch(setAccount(emptyAccount));
5758
setIsLoading(true);
5859
const provider: PasskeyProvider =

src/hooks/login/useWalletConnectV2Login.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import {
1616
import {
1717
emptyAccount,
1818
setAccount,
19+
setAddress,
1920
setWalletConnectLogin
2021
} from 'reduxStore/slices';
2122
import { LoginMethodsEnum } from 'types/enums.types';
@@ -290,6 +291,7 @@ export const useWalletConnectV2Login = ({
290291

291292
async function initiateLogin(loginProvider = true) {
292293
clearInitiatedLogins();
294+
dispatch(setAddress(emptyAccount.address));
293295
dispatch(setAccount(emptyAccount));
294296
const chainId = await waitForChainID({ maxRetries: 15 });
295297

0 commit comments

Comments
 (0)