From 12226d56bf836c4433cbb8b677b7c238c475cea2 Mon Sep 17 00:00:00 2001 From: yanas Date: Tue, 14 Jan 2025 14:25:58 +0100 Subject: [PATCH] fixup! fix(suite-native): use correct receive flow screens for connected device --- suite-native/app/package.json | 1 - .../app/src/navigation/RootStackNavigator.tsx | 3 +-- suite-native/app/tsconfig.json | 1 - suite-native/module-receive/package.json | 20 ------------------- suite-native/module-receive/src/index.ts | 1 - suite-native/module-receive/tsconfig.json | 8 -------- suite-native/receive/package.json | 1 + suite-native/receive/src/index.ts | 1 + .../src/navigation/ReceiveStackNavigator.tsx | 0 .../src/screens/ReceiveAccountsScreen.tsx | 0 yarn.lock | 15 +------------- 11 files changed, 4 insertions(+), 47 deletions(-) delete mode 100644 suite-native/module-receive/package.json delete mode 100644 suite-native/module-receive/src/index.ts delete mode 100644 suite-native/module-receive/tsconfig.json rename suite-native/{module-receive => receive}/src/navigation/ReceiveStackNavigator.tsx (100%) rename suite-native/{module-receive => receive}/src/screens/ReceiveAccountsScreen.tsx (100%) diff --git a/suite-native/app/package.json b/suite-native/app/package.json index 99b536d08ff..f65d33e9f05 100644 --- a/suite-native/app/package.json +++ b/suite-native/app/package.json @@ -65,7 +65,6 @@ "@suite-native/module-device-settings": "workspace:*", "@suite-native/module-home": "workspace:*", "@suite-native/module-onboarding": "workspace:*", - "@suite-native/module-receive": "workspace:*", "@suite-native/module-send": "workspace:*", "@suite-native/module-settings": "workspace:*", "@suite-native/module-staking-management": "workspace:*", diff --git a/suite-native/app/src/navigation/RootStackNavigator.tsx b/suite-native/app/src/navigation/RootStackNavigator.tsx index 3fa45e8f7d2..d700f62daee 100644 --- a/suite-native/app/src/navigation/RootStackNavigator.tsx +++ b/suite-native/app/src/navigation/RootStackNavigator.tsx @@ -17,8 +17,7 @@ import { selectIsOnboardingFinished } from '@suite-native/settings'; import { DevUtilsStackNavigator } from '@suite-native/module-dev-utils'; import { TransactionDetailScreen } from '@suite-native/transactions'; import { OnboardingStackNavigator } from '@suite-native/module-onboarding'; -import { ReceiveStackNavigator } from '@suite-native/module-receive'; -import { ReceiveModalScreen } from '@suite-native/receive'; +import { ReceiveStackNavigator, ReceiveModalScreen } from '@suite-native/receive'; import { AuthorizeDeviceStackNavigator } from '@suite-native/module-authorize-device'; import { AddCoinAccountStackNavigator } from '@suite-native/module-add-accounts'; import { DeviceSettingsStackNavigator } from '@suite-native/module-device-settings'; diff --git a/suite-native/app/tsconfig.json b/suite-native/app/tsconfig.json index c60093a96d0..a0a82736d9b 100644 --- a/suite-native/app/tsconfig.json +++ b/suite-native/app/tsconfig.json @@ -54,7 +54,6 @@ { "path": "../module-device-settings" }, { "path": "../module-home" }, { "path": "../module-onboarding" }, - { "path": "../module-receive" }, { "path": "../module-send" }, { "path": "../module-settings" }, { diff --git a/suite-native/module-receive/package.json b/suite-native/module-receive/package.json deleted file mode 100644 index 89ebcdbfced..00000000000 --- a/suite-native/module-receive/package.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "@suite-native/module-receive", - "version": "1.0.0", - "private": true, - "license": "See LICENSE.md in repo root", - "sideEffects": false, - "main": "src/index", - "scripts": { - "depcheck": "yarn g:depcheck", - "type-check": "yarn g:tsc --build" - }, - "dependencies": { - "@react-navigation/native": "6.1.18", - "@react-navigation/native-stack": "6.11.0", - "@suite-native/accounts": "workspace:*", - "@suite-native/navigation": "workspace:*", - "react": "18.2.0", - "react-native": "0.76.1" - } -} diff --git a/suite-native/module-receive/src/index.ts b/suite-native/module-receive/src/index.ts deleted file mode 100644 index 77aedb3f3b2..00000000000 --- a/suite-native/module-receive/src/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './navigation/ReceiveStackNavigator'; diff --git a/suite-native/module-receive/tsconfig.json b/suite-native/module-receive/tsconfig.json deleted file mode 100644 index 1b580277621..00000000000 --- a/suite-native/module-receive/tsconfig.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "extends": "../../tsconfig.base.json", - "compilerOptions": { "outDir": "libDev" }, - "references": [ - { "path": "../accounts" }, - { "path": "../navigation" } - ] -} diff --git a/suite-native/receive/package.json b/suite-native/receive/package.json index 6f3e25f4453..bfd06cab63d 100644 --- a/suite-native/receive/package.json +++ b/suite-native/receive/package.json @@ -12,6 +12,7 @@ "dependencies": { "@mobily/ts-belt": "^3.13.1", "@react-navigation/native": "6.1.18", + "@react-navigation/native-stack": "6.11.0", "@reduxjs/toolkit": "1.9.5", "@shopify/react-native-skia": "^1.5.10", "@suite-common/wallet-config": "workspace:*", diff --git a/suite-native/receive/src/index.ts b/suite-native/receive/src/index.ts index e8bb539b481..9f845cb2f85 100644 --- a/suite-native/receive/src/index.ts +++ b/suite-native/receive/src/index.ts @@ -1,3 +1,4 @@ +export * from './navigation/ReceiveStackNavigator'; export * from './screens/ReceiveAccountScreen'; export * from './screens/ReceiveModalScreen'; export { ReceiveScreenHeader } from './components/ReceiveScreenHeader'; diff --git a/suite-native/module-receive/src/navigation/ReceiveStackNavigator.tsx b/suite-native/receive/src/navigation/ReceiveStackNavigator.tsx similarity index 100% rename from suite-native/module-receive/src/navigation/ReceiveStackNavigator.tsx rename to suite-native/receive/src/navigation/ReceiveStackNavigator.tsx diff --git a/suite-native/module-receive/src/screens/ReceiveAccountsScreen.tsx b/suite-native/receive/src/screens/ReceiveAccountsScreen.tsx similarity index 100% rename from suite-native/module-receive/src/screens/ReceiveAccountsScreen.tsx rename to suite-native/receive/src/screens/ReceiveAccountsScreen.tsx diff --git a/yarn.lock b/yarn.lock index 3c657199a4d..6c2b0dd07cb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9986,7 +9986,6 @@ __metadata: "@suite-native/module-device-settings": "workspace:*" "@suite-native/module-home": "workspace:*" "@suite-native/module-onboarding": "workspace:*" - "@suite-native/module-receive": "workspace:*" "@suite-native/module-send": "workspace:*" "@suite-native/module-settings": "workspace:*" "@suite-native/module-staking-management": "workspace:*" @@ -10800,19 +10799,6 @@ __metadata: languageName: unknown linkType: soft -"@suite-native/module-receive@workspace:*, @suite-native/module-receive@workspace:suite-native/module-receive": - version: 0.0.0-use.local - resolution: "@suite-native/module-receive@workspace:suite-native/module-receive" - dependencies: - "@react-navigation/native": "npm:6.1.18" - "@react-navigation/native-stack": "npm:6.11.0" - "@suite-native/accounts": "workspace:*" - "@suite-native/navigation": "workspace:*" - react: "npm:18.2.0" - react-native: "npm:0.76.1" - languageName: unknown - linkType: soft - "@suite-native/module-send@workspace:*, @suite-native/module-send@workspace:suite-native/module-send": version: 0.0.0-use.local resolution: "@suite-native/module-send@workspace:suite-native/module-send" @@ -11027,6 +11013,7 @@ __metadata: dependencies: "@mobily/ts-belt": "npm:^3.13.1" "@react-navigation/native": "npm:6.1.18" + "@react-navigation/native-stack": "npm:6.11.0" "@reduxjs/toolkit": "npm:1.9.5" "@shopify/react-native-skia": "npm:^1.5.10" "@suite-common/wallet-config": "workspace:*"