Skip to content

Commit b7d9e11

Browse files
Fixed helper structure
1 parent 789f968 commit b7d9e11

File tree

2 files changed

+13
-22
lines changed

2 files changed

+13
-22
lines changed

src/components/ProviderInitializer/ProviderInitializer.tsx

+1-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ export function ProviderInitializer() {
8585
const tokenLogin = useSelector(tokenLoginSelector);
8686
const userAccount = useSelector(accountSelector);
8787
const nativeAuthConfig = tokenLogin?.nativeAuthConfig;
88-
const handleGuardianWarningToast = handleGuardianWarning();
8988

9089
const loginService = useLoginService(
9190
nativeAuthConfig ? nativeAuthConfig : false
@@ -133,7 +132,7 @@ export function ProviderInitializer() {
133132

134133
useEffect(() => {
135134
if (isLoggedIn && userAccount.address) {
136-
handleGuardianWarningToast(userAccount);
135+
handleGuardianWarning(userAccount);
137136
}
138137
}, [isLoggedIn, userAccount]);
139138

src/components/ProviderInitializer/helpers/handleGuardianWarning.tsx

+12-20
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { localStorageKeys } from 'utils/storage/local';
99
const DAYS_TO_SHOW_AGAIN_AFTER_DISMISSAL = 3;
1010
const SECONDS_IN_A_DAY = 24 * 60 * 60;
1111

12-
export const handleGuardianWarning = () => {
12+
export const handleGuardianWarning = (userAccount: AccountType) => {
1313
const handleToastDismissal = () => {
1414
const daysAsSeconds = SECONDS_IN_A_DAY * DAYS_TO_SHOW_AGAIN_AFTER_DISMISSAL;
1515
const currentTimestamp = Math.floor(Date.now() / 1000);
@@ -21,30 +21,22 @@ export const handleGuardianWarning = () => {
2121
});
2222
};
2323

24-
const insertGuardianWarningToast = () => {
24+
const guardianBreachToastDismissTimestamp = storage.local.getItem(
25+
localStorageKeys.guardianBreachToastDismissTimestamp
26+
);
27+
28+
const isGuardedAccountPendingChange =
29+
userAccount.isGuarded &&
30+
userAccount.activeGuardianAddress &&
31+
userAccount.pendingGuardianAddress;
32+
33+
if (isGuardedAccountPendingChange && !guardianBreachToastDismissTimestamp) {
2534
addNewCustomToast({
2635
toastId: 'guardianUnconfirmedChangeWarning',
2736
title: 'Account at risk!',
2837
component: () => <GuardianWarningToast />,
2938
icon: faWarning,
3039
onClose: handleToastDismissal
3140
});
32-
};
33-
34-
const handleGuardianWarningToast = (userAccount: AccountType) => {
35-
const guardianBreachToastDismissTimestamp = storage.local.getItem(
36-
localStorageKeys.guardianBreachToastDismissTimestamp
37-
);
38-
39-
const isGuardedAccountPendingChange =
40-
userAccount.isGuarded &&
41-
userAccount.activeGuardianAddress &&
42-
userAccount.pendingGuardianAddress;
43-
44-
if (isGuardedAccountPendingChange && !guardianBreachToastDismissTimestamp) {
45-
insertGuardianWarningToast();
46-
}
47-
};
48-
49-
return handleGuardianWarningToast;
41+
}
5042
};

0 commit comments

Comments
 (0)