Skip to content

Commit ad79b8d

Browse files
authored
fix backup tips bug && fathom script code (#432)
1 parent 07906e8 commit ad79b8d

File tree

3 files changed

+28
-19
lines changed

3 files changed

+28
-19
lines changed

packages/kit/src/views/BackupTips/index.tsx

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -70,15 +70,17 @@ const BackupTips: FC = () => {
7070
width="100%"
7171
onPress={() => {
7272
navigation.getParent()?.goBack();
73-
navigation.navigate(RootRoutes.Modal, {
74-
screen: ModalRoutes.BackupWallet,
75-
params: {
76-
screen: BackupWalletModalRoutes.BackupWalletModal,
73+
setTimeout(() => {
74+
navigation.navigate(RootRoutes.Modal, {
75+
screen: ModalRoutes.BackupWallet,
7776
params: {
78-
walletId,
77+
screen: BackupWalletModalRoutes.BackupWalletModal,
78+
params: {
79+
walletId,
80+
},
7981
},
80-
},
81-
});
82+
});
83+
}, 100);
8284
}}
8385
>
8486
{intl.formatMessage({ id: 'action__back_up_now' })}

packages/kit/src/views/Wallet/index.tsx

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -85,22 +85,27 @@ const Home: FC = () => {
8585
const [offline, setOffline] = useState(false);
8686
const [backupTip, setBackupTip] = useState(true);
8787
useEffect(() => {
88-
if (wallet && !wallet.backuped && backupTip) {
89-
navigation.navigate(RootRoutes.Modal, {
90-
screen: ModalRoutes.CreateWallet,
91-
params: {
92-
screen: CreateWalletModalRoutes.BackupTipsModal,
93-
params: { walletId: wallet.id },
94-
},
95-
});
96-
}
97-
setBackupTip(() => false);
88+
const t = setTimeout(() => {
89+
if (platformEnv.isDev && wallet && !wallet.backuped && backupTip) {
90+
navigation.navigate(RootRoutes.Modal, {
91+
screen: ModalRoutes.CreateWallet,
92+
params: {
93+
screen: CreateWalletModalRoutes.BackupTipsModal,
94+
params: { walletId: wallet.id },
95+
},
96+
});
97+
}
98+
setBackupTip(() => false);
99+
}, 2000);
98100

99101
const unsubscribe = NetInfo.addEventListener((state) => {
100102
setOffline(state.type === NetInfoStateType.none);
101103
});
102-
return unsubscribe;
103-
}, [navigation, backupTip, wallet]);
104+
return () => {
105+
unsubscribe();
106+
clearTimeout(t);
107+
};
108+
}, []);
104109

105110
if (!wallet) {
106111
return (

packages/shared/src/web/index.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
</head>
1818

1919
<body class="onekey-body">
20+
<script src="https://jarvis.onekey.so/script.js" data-site="GVSVXVLI" data-spa="auto" defer>
21+
</script>
2022
<!--
2123
A generic no script element with a reload button and a message.
2224
Feel free to customize this however you'd like.

0 commit comments

Comments
 (0)