fix(HW-667): fix hardware button navigation (#2099)

Co-authored-by: iGroza <[email protected]>
haqq-network · Sep 17, 2024 · f134188 · f134188
1 parent a0ee48e
commit f134188
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/screens/WelcomeStack/SignInStack/signin-networks.tsx b/src/screens/WelcomeStack/SignInStack/signin-networks.tsx
@@ -13,6 +13,8 @@ import {getMetadataValueWrapped} from '@app/helpers/wrappers/get-metadata-value'
 import {useTypedNavigation} from '@app/hooks';
 import {ErrorHandler} from '@app/models/error-handler';
 import {
+  HomeStackParamList,
+  HomeStackRoutes,
   SignInStackParamList,
   SignInStackRoutes,
   WelcomeStackRoutes,
@@ -27,7 +29,9 @@ import {
 import {RemoteConfig} from '@app/services/remote-config';
 
 export const SignInNetworksScreen = memo(() => {
-  const navigation = useTypedNavigation<SignInStackParamList>();
+  const navigation = useTypedNavigation<
+    SignInStackParamList & HomeStackParamList
+  >();
 
   const onLogin = useCallback(
     async (provider: SssProviders, skipCheck: boolean = false) => {
@@ -139,7 +143,9 @@ export const SignInNetworksScreen = memo(() => {
   }, [navigation]);
 
   const onPressHardwareWallet = useCallback(() => {
-    navigation.navigate(WelcomeStackRoutes.Device);
+    navigation.navigate(
+      app.onboarded ? HomeStackRoutes.Device : WelcomeStackRoutes.Device,
+    );
   }, [navigation]);
 
   return (

diff --git a/src/screens/WelcomeStack/SignUpStack/signup-agreement.tsx b/src/screens/WelcomeStack/SignUpStack/signup-agreement.tsx
@@ -1,8 +1,11 @@
 import React, {memo, useCallback} from 'react';
 
 import {CreateAgreement} from '@app/components/create-agreement';
+import {app} from '@app/contexts';
 import {useTypedNavigation, useTypedRoute} from '@app/hooks';
 import {
+  HomeStackParamList,
+  HomeStackRoutes,
   SignUpStackParamList,
   SignUpStackRoutes,
   WelcomeStackRoutes,
@@ -11,7 +14,7 @@ import {
 export const SignUpAgreementScreen = memo(() => {
   const navigation = useTypedNavigation<SignUpStackParamList>();
   const params = useTypedRoute<
-    SignUpStackParamList,
+    SignUpStackParamList & HomeStackParamList,
     SignUpStackRoutes.SignUpAgreement
   >().params;
   const onPressRegularWallet = useCallback(() => {
@@ -25,7 +28,10 @@ export const SignUpAgreementScreen = memo(() => {
   }, [navigation, params.nextScreen]);
 
   const onPressHardwareWallet = () => {
-    navigation.navigate(WelcomeStackRoutes.Device);
+    navigation.navigate(
+      // @ts-ignore
+      app.onboarded ? HomeStackRoutes.Device : WelcomeStackRoutes.Device,
+    );
   };
 
   return (