From 1cd4f5d7bf0fd5f4cd7b02d636aa069f9757c0ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Such=C3=BD?= Date: Sun, 26 Jun 2022 22:02:40 +0200 Subject: [PATCH] chore: separate suite native to its own packges folder (#5685) --- .dockerignore | 5 +++-- CODEOWNERS | 4 +--- README.md | 4 ++-- ci/build.yml | 2 +- lerna.json | 2 +- package.json | 1 + .../__tests__/index.test.ts | 4 ++-- packages/suite-native-home/tsconfig.json | 9 -------- .../tsconfig.json | 11 ---------- packages/suite-native-settings/tsconfig.json | 9 -------- packages/suite-native/tsconfig.json | 15 ------------- .../app}/.buckconfig | 0 .../app}/.eslintrc.js | 0 .../app}/.gitignore | 0 .../app}/.watchmanconfig | 0 .../suite-native => suite-native/app}/Gemfile | 0 .../app}/Gemfile.lock | 0 .../app}/README.md | 0 .../app}/_bundle/config | 0 .../app}/_ruby-version | 0 .../app}/android/app/_BUCK | 0 .../app}/android/app/build.gradle | 2 +- .../app}/android/app/build_defs.bzl | 0 .../app}/android/app/debug.keystore | Bin .../app}/android/app/proguard-rules.pro | 0 .../android/app/src/debug/AndroidManifest.xml | 0 .../io/trezor/suite/ReactNativeFlipper.java | 0 .../res/drawable/ic_launcher_foreground.xml | 0 .../dev/res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../src/dev/res/mipmap-hdpi/ic_launcher.png | Bin .../dev/res/mipmap-hdpi/ic_launcher_round.png | Bin .../src/dev/res/mipmap-mdpi/ic_launcher.png | Bin .../dev/res/mipmap-mdpi/ic_launcher_round.png | Bin .../src/dev/res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher_round.png | Bin .../src/dev/res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin .../dev/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin .../app/src/dev/res/values/strings.xml | 0 .../src/firebaseDevelop/google-services.json | 0 .../res/drawable/ic_launcher_foreground.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-hdpi/ic_launcher_round.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher_round.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher_round.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin .../firebaseDevelop/res/values/strings.xml | 0 .../res/drawable/ic_launcher_foreground.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-hdpi/ic_launcher_round.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher_round.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher_round.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin .../firebaseStaging/res/values/strings.xml | 0 .../android/app/src/main/AndroidManifest.xml | 0 .../src/main/assets/fonts/TTSatoshi-Bold.otf | Bin .../main/assets/fonts/TTSatoshi-DemiBold.otf | Bin .../main/assets/fonts/TTSatoshi-Medium.otf | Bin .../main/assets/fonts/TTSatoshi-Regular.otf | Bin .../java/io/trezor/suite/MainActivity.java | 0 .../java/io/trezor/suite/MainApplication.java | 2 +- .../MainApplicationReactNativeHost.java | 2 +- .../components/MainComponentsRegistry.java | 0 ...ApplicationTurboModuleManagerDelegate.java | 0 .../app}/android/app/src/main/jni/Android.mk | 0 .../jni/MainApplicationModuleProvider.cpp | 0 .../main/jni/MainApplicationModuleProvider.h | 0 ...nApplicationTurboModuleManagerDelegate.cpp | 0 ...ainApplicationTurboModuleManagerDelegate.h | 0 .../src/main/jni/MainComponentsRegistry.cpp | 0 .../app/src/main/jni/MainComponentsRegistry.h | 0 .../app}/android/app/src/main/jni/OnLoad.cpp | 0 .../res/drawable/ic_launcher_foreground.xml | 0 .../res/drawable/rn_edit_text_material.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-hdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher_round.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin .../res/values/ic_launcher_background.xml | 0 .../app/src/main/res/values/strings.xml | 0 .../app/src/main/res/values/styles.xml | 0 .../app}/android/build.gradle | 0 .../app}/android/fastlane/Fastfile | 0 .../app}/android/gradle.properties | 0 .../android/gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 .../app}/android/gradlew | 0 .../app}/android/gradlew.bat | 0 .../app}/android/settings.gradle | 0 .../app}/app.json | 0 .../app}/babel.config.js | 0 .../app}/fastlane/Appfile | 0 .../app}/fastlane/Fastfile | 0 .../app}/fastlane/Pluginfile | 0 .../app}/files/app_icon_512x512.svg | 0 .../app}/files/app_icon_512x512_dev.svg | 0 .../app}/files/app_icon_512x512_local.svg | 0 .../app}/files/app_icon_512x512_stag.svg | 0 .../app}/globalPolyfills.js | 0 .../app}/index.js | 0 .../app}/ios/Podfile | 0 .../app}/ios/Podfile.lock | 16 +++++++------- .../ios/TrezorSuite.xcodeproj/project.pbxproj | 20 ++++++++++++++---- .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../xcschemes/TrezorSuite.xcscheme | 0 .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../app}/ios/TrezorSuite/AppDelegate.h | 0 .../app}/ios/TrezorSuite/AppDelegate.mm | 2 +- .../AppIcon.appiconset/Contents.json | 0 .../TrezorSuite/Images.xcassets/Contents.json | 0 .../app}/ios/TrezorSuite/Info.plist | 2 +- .../ios/TrezorSuite/LaunchScreen.storyboard | 0 .../app}/ios/TrezorSuite/main.m | 0 .../app}/ios/TrezorSuiteTests/Info.plist | 0 .../ios/TrezorSuiteTests/TrezorSuiteTests.m | 0 .../app}/ios/fastlane/Fastfile | 0 .../app}/metro.config.js | 0 .../app}/package.json | 0 .../app}/react-native.config.js | 2 +- .../app}/src/App.tsx | 0 .../app}/src/__tests__/App-test.tsx | 0 suite-native/app/tsconfig.json | 15 +++++++++++++ .../atoms}/README.md | 0 .../atoms}/jest.config.js | 0 .../atoms}/package.json | 0 .../atoms}/src/Box.tsx | 0 .../atoms}/src/Button/Button.tsx | 0 .../atoms}/src/Button/IconButton.tsx | 0 .../atoms}/src/Button/TileButton.tsx | 0 .../atoms}/src/CheckBox.tsx | 0 .../atoms}/src/Chip.tsx | 0 .../atoms}/src/Hint.tsx | 0 .../atoms}/src/Input/Input.tsx | 0 .../atoms}/src/Input/InputWrapper.tsx | 0 .../atoms}/src/Input/SearchInput.tsx | 0 .../atoms}/src/ListItem/ListItem.tsx | 0 .../atoms}/src/ListItem/ListItemIcon.tsx | 0 .../atoms}/src/ListItem/ListItemText.tsx | 0 .../src/ListItem/SelectableListItem.tsx | 0 .../atoms}/src/ListItem/listItemTypes.ts | 0 .../atoms}/src/Modal/BottomModal.tsx | 0 .../atoms}/src/Modal/BottomModalContainer.tsx | 0 .../atoms}/src/NumPadButton.tsx | 0 .../atoms}/src/Radio.tsx | 0 .../atoms}/src/Select/Select.tsx | 0 .../atoms}/src/Select/SelectItem.tsx | 0 .../atoms}/src/Select/SelectTrigger.tsx | 0 .../atoms}/src/Switch.tsx | 0 .../atoms}/src/Text.tsx | 0 .../atoms}/src/TipToast.tsx | 0 .../atoms}/src/VStack.tsx | 0 .../atoms}/src/index.ts | 0 suite-native/atoms/tsconfig.json | 9 ++++++++ .../module-home}/jest.config.js | 0 .../module-home}/package.json | 0 .../module-home}/src/index.ts | 0 .../src/navigation/HomeStackNavigator.tsx | 0 .../module-home}/src/navigation/routes.ts | 0 .../src/screens/HomeDemoScreen.tsx | 0 .../module-home}/src/screens/HomeScreen.tsx | 0 .../module-home}/tsconfig.json | 6 +++--- .../module-settings}/jest.config.js | 0 .../module-settings}/package.json | 0 .../src/components/ApplicationSettings.tsx | 0 .../src/components/CoinsSettings.tsx | 0 .../src/components/DeviceActionButtons.tsx | 0 .../src/components/DeviceSettings.tsx | 0 .../src/components/SettingsSection.tsx | 0 .../src/components/SettingsSectionItem.tsx | 0 .../module-settings}/src/index.ts | 0 .../src/navigation/SettingsStackNavigator.tsx | 0 .../module-settings}/src/navigation/routes.ts | 0 .../src/screens/SettingsAdvancedScreen.tsx | 0 .../src/screens/SettingsLabelingScreen.tsx | 0 .../screens/SettingsLocalisationScreen.tsx | 0 .../src/screens/SettingsScreen.tsx | 0 .../module-settings}/tsconfig.json | 6 +++--- .../navigation-root}/jest.config.js | 0 .../navigation-root}/package.json | 0 .../src/dummyScreens/AccountsScreen.tsx | 0 .../src/dummyScreens/ActionScreen.tsx | 0 .../src/dummyScreens/PricesScreen.tsx | 0 .../navigation-root}/src/index.ts | 0 .../src/navigation/RootTabNavigator.tsx | 0 .../src/navigation/navigationMap.d.ts | 0 .../navigation-root}/src/navigation/routes.ts | 0 suite-native/navigation-root/tsconfig.json | 11 ++++++++++ .../navigation}/jest.config.js | 0 .../navigation}/package.json | 0 .../navigation}/src/components/Screen.tsx | 0 .../src/components/ScreenHeader.tsx | 0 .../navigation}/src/components/TabBar.tsx | 0 .../navigation}/src/components/TabBarItem.tsx | 0 .../navigation}/src/config.ts | 0 .../navigation}/src/index.ts | 0 .../navigation}/src/types.tsx | 0 suite-native/navigation/tsconfig.json | 9 ++++++++ 223 files changed, 91 insertions(+), 79 deletions(-) delete mode 100644 packages/suite-native-home/tsconfig.json delete mode 100644 packages/suite-native-navigation-root/tsconfig.json delete mode 100644 packages/suite-native-settings/tsconfig.json delete mode 100644 packages/suite-native/tsconfig.json rename {packages/suite-native => suite-native/app}/.buckconfig (100%) rename {packages/suite-native => suite-native/app}/.eslintrc.js (100%) rename {packages/suite-native => suite-native/app}/.gitignore (100%) rename {packages/suite-native => suite-native/app}/.watchmanconfig (100%) rename {packages/suite-native => suite-native/app}/Gemfile (100%) rename {packages/suite-native => suite-native/app}/Gemfile.lock (100%) rename {packages/suite-native => suite-native/app}/README.md (100%) rename {packages/suite-native => suite-native/app}/_bundle/config (100%) rename {packages/suite-native => suite-native/app}/_ruby-version (100%) rename {packages/suite-native => suite-native/app}/android/app/_BUCK (100%) rename {packages/suite-native => suite-native/app}/android/app/build.gradle (99%) rename {packages/suite-native => suite-native/app}/android/app/build_defs.bzl (100%) rename {packages/suite-native => suite-native/app}/android/app/debug.keystore (100%) rename {packages/suite-native => suite-native/app}/android/app/proguard-rules.pro (100%) rename {packages/suite-native => suite-native/app}/android/app/src/debug/AndroidManifest.xml (100%) rename {packages/suite-native => suite-native/app}/android/app/src/debug/java/io/trezor/suite/ReactNativeFlipper.java (100%) rename {packages/suite-native => suite-native/app}/android/app/src/dev/res/drawable/ic_launcher_foreground.xml (100%) rename {packages/suite-native => suite-native/app}/android/app/src/dev/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename {packages/suite-native => suite-native/app}/android/app/src/dev/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename {packages/suite-native => suite-native/app}/android/app/src/dev/res/mipmap-hdpi/ic_launcher.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/dev/res/mipmap-hdpi/ic_launcher_round.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/dev/res/mipmap-mdpi/ic_launcher.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/dev/res/mipmap-mdpi/ic_launcher_round.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/dev/res/mipmap-xhdpi/ic_launcher.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/dev/res/mipmap-xhdpi/ic_launcher_round.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/dev/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/dev/res/mipmap-xxhdpi/ic_launcher_round.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/dev/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/dev/res/mipmap-xxxhdpi/ic_launcher_round.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/dev/res/values/strings.xml (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseDevelop/google-services.json (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseDevelop/res/drawable/ic_launcher_foreground.xml (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseDevelop/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseDevelop/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseDevelop/res/mipmap-hdpi/ic_launcher.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseDevelop/res/mipmap-hdpi/ic_launcher_round.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseDevelop/res/mipmap-mdpi/ic_launcher.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseDevelop/res/mipmap-mdpi/ic_launcher_round.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseDevelop/res/mipmap-xhdpi/ic_launcher.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseDevelop/res/mipmap-xhdpi/ic_launcher_round.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseDevelop/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseDevelop/res/mipmap-xxhdpi/ic_launcher_round.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseDevelop/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseDevelop/res/mipmap-xxxhdpi/ic_launcher_round.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseDevelop/res/values/strings.xml (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseStaging/res/drawable/ic_launcher_foreground.xml (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseStaging/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseStaging/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseStaging/res/mipmap-hdpi/ic_launcher.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseStaging/res/mipmap-hdpi/ic_launcher_round.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseStaging/res/mipmap-mdpi/ic_launcher.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseStaging/res/mipmap-mdpi/ic_launcher_round.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseStaging/res/mipmap-xhdpi/ic_launcher.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseStaging/res/mipmap-xhdpi/ic_launcher_round.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseStaging/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseStaging/res/mipmap-xxhdpi/ic_launcher_round.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseStaging/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseStaging/res/mipmap-xxxhdpi/ic_launcher_round.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/firebaseStaging/res/values/strings.xml (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/AndroidManifest.xml (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/assets/fonts/TTSatoshi-Bold.otf (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/assets/fonts/TTSatoshi-DemiBold.otf (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/assets/fonts/TTSatoshi-Medium.otf (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/assets/fonts/TTSatoshi-Regular.otf (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/java/io/trezor/suite/MainActivity.java (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/java/io/trezor/suite/MainApplication.java (98%) rename {packages/suite-native => suite-native/app}/android/app/src/main/java/io/trezor/suite/newarchitecture/MainApplicationReactNativeHost.java (99%) rename {packages/suite-native => suite-native/app}/android/app/src/main/java/io/trezor/suite/newarchitecture/components/MainComponentsRegistry.java (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/java/io/trezor/suite/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/jni/Android.mk (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/jni/MainApplicationModuleProvider.cpp (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/jni/MainApplicationModuleProvider.h (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/jni/MainComponentsRegistry.cpp (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/jni/MainComponentsRegistry.h (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/jni/OnLoad.cpp (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/res/drawable/ic_launcher_foreground.xml (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/res/drawable/rn_edit_text_material.xml (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/res/values/ic_launcher_background.xml (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/res/values/strings.xml (100%) rename {packages/suite-native => suite-native/app}/android/app/src/main/res/values/styles.xml (100%) rename {packages/suite-native => suite-native/app}/android/build.gradle (100%) rename {packages/suite-native => suite-native/app}/android/fastlane/Fastfile (100%) rename {packages/suite-native => suite-native/app}/android/gradle.properties (100%) rename {packages/suite-native => suite-native/app}/android/gradle/wrapper/gradle-wrapper.jar (100%) rename {packages/suite-native => suite-native/app}/android/gradle/wrapper/gradle-wrapper.properties (100%) rename {packages/suite-native => suite-native/app}/android/gradlew (100%) rename {packages/suite-native => suite-native/app}/android/gradlew.bat (100%) rename {packages/suite-native => suite-native/app}/android/settings.gradle (100%) rename {packages/suite-native => suite-native/app}/app.json (100%) rename {packages/suite-native => suite-native/app}/babel.config.js (100%) rename {packages/suite-native => suite-native/app}/fastlane/Appfile (100%) rename {packages/suite-native => suite-native/app}/fastlane/Fastfile (100%) rename {packages/suite-native => suite-native/app}/fastlane/Pluginfile (100%) rename {packages/suite-native => suite-native/app}/files/app_icon_512x512.svg (100%) rename {packages/suite-native => suite-native/app}/files/app_icon_512x512_dev.svg (100%) rename {packages/suite-native => suite-native/app}/files/app_icon_512x512_local.svg (100%) rename {packages/suite-native => suite-native/app}/files/app_icon_512x512_stag.svg (100%) rename {packages/suite-native => suite-native/app}/globalPolyfills.js (100%) rename {packages/suite-native => suite-native/app}/index.js (100%) rename {packages/suite-native => suite-native/app}/ios/Podfile (100%) rename {packages/suite-native => suite-native/app}/ios/Podfile.lock (98%) rename {packages/suite-native => suite-native/app}/ios/TrezorSuite.xcodeproj/project.pbxproj (92%) rename {packages/suite-native => suite-native/app}/ios/TrezorSuite.xcodeproj/project.xcworkspace/contents.xcworkspacedata (100%) rename {packages/suite-native => suite-native/app}/ios/TrezorSuite.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename {packages/suite-native => suite-native/app}/ios/TrezorSuite.xcodeproj/xcshareddata/xcschemes/TrezorSuite.xcscheme (100%) rename {packages/suite-native => suite-native/app}/ios/TrezorSuite.xcworkspace/contents.xcworkspacedata (100%) rename {packages/suite-native => suite-native/app}/ios/TrezorSuite.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename {packages/suite-native => suite-native/app}/ios/TrezorSuite/AppDelegate.h (100%) rename {packages/suite-native => suite-native/app}/ios/TrezorSuite/AppDelegate.mm (98%) rename {packages/suite-native => suite-native/app}/ios/TrezorSuite/Images.xcassets/AppIcon.appiconset/Contents.json (100%) rename {packages/suite-native => suite-native/app}/ios/TrezorSuite/Images.xcassets/Contents.json (100%) rename {packages/suite-native => suite-native/app}/ios/TrezorSuite/Info.plist (98%) rename {packages/suite-native => suite-native/app}/ios/TrezorSuite/LaunchScreen.storyboard (100%) rename {packages/suite-native => suite-native/app}/ios/TrezorSuite/main.m (100%) rename {packages/suite-native => suite-native/app}/ios/TrezorSuiteTests/Info.plist (100%) rename {packages/suite-native => suite-native/app}/ios/TrezorSuiteTests/TrezorSuiteTests.m (100%) rename {packages/suite-native => suite-native/app}/ios/fastlane/Fastfile (100%) rename {packages/suite-native => suite-native/app}/metro.config.js (100%) rename {packages/suite-native => suite-native/app}/package.json (100%) rename {packages/suite-native => suite-native/app}/react-native.config.js (64%) rename {packages/suite-native => suite-native/app}/src/App.tsx (100%) rename {packages/suite-native => suite-native/app}/src/__tests__/App-test.tsx (100%) create mode 100644 suite-native/app/tsconfig.json rename {packages/suite-native-atoms => suite-native/atoms}/README.md (100%) rename {packages/suite-native-atoms => suite-native/atoms}/jest.config.js (100%) rename {packages/suite-native-atoms => suite-native/atoms}/package.json (100%) rename {packages/suite-native-atoms => suite-native/atoms}/src/Box.tsx (100%) rename {packages/suite-native-atoms => suite-native/atoms}/src/Button/Button.tsx (100%) rename {packages/suite-native-atoms => suite-native/atoms}/src/Button/IconButton.tsx (100%) rename {packages/suite-native-atoms => suite-native/atoms}/src/Button/TileButton.tsx (100%) rename {packages/suite-native-atoms => suite-native/atoms}/src/CheckBox.tsx (100%) rename {packages/suite-native-atoms => suite-native/atoms}/src/Chip.tsx (100%) rename {packages/suite-native-atoms => suite-native/atoms}/src/Hint.tsx (100%) rename {packages/suite-native-atoms => suite-native/atoms}/src/Input/Input.tsx (100%) rename {packages/suite-native-atoms => suite-native/atoms}/src/Input/InputWrapper.tsx (100%) rename {packages/suite-native-atoms => suite-native/atoms}/src/Input/SearchInput.tsx (100%) rename {packages/suite-native-atoms => suite-native/atoms}/src/ListItem/ListItem.tsx (100%) rename {packages/suite-native-atoms => suite-native/atoms}/src/ListItem/ListItemIcon.tsx (100%) rename {packages/suite-native-atoms => suite-native/atoms}/src/ListItem/ListItemText.tsx (100%) rename {packages/suite-native-atoms => suite-native/atoms}/src/ListItem/SelectableListItem.tsx (100%) rename {packages/suite-native-atoms => suite-native/atoms}/src/ListItem/listItemTypes.ts (100%) rename {packages/suite-native-atoms => suite-native/atoms}/src/Modal/BottomModal.tsx (100%) rename {packages/suite-native-atoms => suite-native/atoms}/src/Modal/BottomModalContainer.tsx (100%) rename {packages/suite-native-atoms => suite-native/atoms}/src/NumPadButton.tsx (100%) rename {packages/suite-native-atoms => suite-native/atoms}/src/Radio.tsx (100%) rename {packages/suite-native-atoms => suite-native/atoms}/src/Select/Select.tsx (100%) rename {packages/suite-native-atoms => suite-native/atoms}/src/Select/SelectItem.tsx (100%) rename {packages/suite-native-atoms => suite-native/atoms}/src/Select/SelectTrigger.tsx (100%) rename {packages/suite-native-atoms => suite-native/atoms}/src/Switch.tsx (100%) rename {packages/suite-native-atoms => suite-native/atoms}/src/Text.tsx (100%) rename {packages/suite-native-atoms => suite-native/atoms}/src/TipToast.tsx (100%) rename {packages/suite-native-atoms => suite-native/atoms}/src/VStack.tsx (100%) rename {packages/suite-native-atoms => suite-native/atoms}/src/index.ts (100%) create mode 100644 suite-native/atoms/tsconfig.json rename {packages/suite-native-home => suite-native/module-home}/jest.config.js (100%) rename {packages/suite-native-home => suite-native/module-home}/package.json (100%) rename {packages/suite-native-home => suite-native/module-home}/src/index.ts (100%) rename {packages/suite-native-home => suite-native/module-home}/src/navigation/HomeStackNavigator.tsx (100%) rename {packages/suite-native-home => suite-native/module-home}/src/navigation/routes.ts (100%) rename {packages/suite-native-home => suite-native/module-home}/src/screens/HomeDemoScreen.tsx (100%) rename {packages/suite-native-home => suite-native/module-home}/src/screens/HomeScreen.tsx (100%) rename {packages/suite-native-atoms => suite-native/module-home}/tsconfig.json (50%) rename {packages/suite-native-navigation => suite-native/module-settings}/jest.config.js (100%) rename {packages/suite-native-settings => suite-native/module-settings}/package.json (100%) rename {packages/suite-native-settings => suite-native/module-settings}/src/components/ApplicationSettings.tsx (100%) rename {packages/suite-native-settings => suite-native/module-settings}/src/components/CoinsSettings.tsx (100%) rename {packages/suite-native-settings => suite-native/module-settings}/src/components/DeviceActionButtons.tsx (100%) rename {packages/suite-native-settings => suite-native/module-settings}/src/components/DeviceSettings.tsx (100%) rename {packages/suite-native-settings => suite-native/module-settings}/src/components/SettingsSection.tsx (100%) rename {packages/suite-native-settings => suite-native/module-settings}/src/components/SettingsSectionItem.tsx (100%) rename {packages/suite-native-settings => suite-native/module-settings}/src/index.ts (100%) rename {packages/suite-native-settings => suite-native/module-settings}/src/navigation/SettingsStackNavigator.tsx (100%) rename {packages/suite-native-settings => suite-native/module-settings}/src/navigation/routes.ts (100%) rename {packages/suite-native-settings => suite-native/module-settings}/src/screens/SettingsAdvancedScreen.tsx (100%) rename {packages/suite-native-settings => suite-native/module-settings}/src/screens/SettingsLabelingScreen.tsx (100%) rename {packages/suite-native-settings => suite-native/module-settings}/src/screens/SettingsLocalisationScreen.tsx (100%) rename {packages/suite-native-settings => suite-native/module-settings}/src/screens/SettingsScreen.tsx (100%) rename {packages/suite-native-navigation => suite-native/module-settings}/tsconfig.json (50%) rename {packages/suite-native-navigation-root => suite-native/navigation-root}/jest.config.js (100%) rename {packages/suite-native-navigation-root => suite-native/navigation-root}/package.json (100%) rename {packages/suite-native-navigation-root => suite-native/navigation-root}/src/dummyScreens/AccountsScreen.tsx (100%) rename {packages/suite-native-navigation-root => suite-native/navigation-root}/src/dummyScreens/ActionScreen.tsx (100%) rename {packages/suite-native-navigation-root => suite-native/navigation-root}/src/dummyScreens/PricesScreen.tsx (100%) rename {packages/suite-native-navigation-root => suite-native/navigation-root}/src/index.ts (100%) rename {packages/suite-native-navigation-root => suite-native/navigation-root}/src/navigation/RootTabNavigator.tsx (100%) rename {packages/suite-native-navigation-root => suite-native/navigation-root}/src/navigation/navigationMap.d.ts (100%) rename {packages/suite-native-navigation-root => suite-native/navigation-root}/src/navigation/routes.ts (100%) create mode 100644 suite-native/navigation-root/tsconfig.json rename {packages/suite-native-settings => suite-native/navigation}/jest.config.js (100%) rename {packages/suite-native-navigation => suite-native/navigation}/package.json (100%) rename {packages/suite-native-navigation => suite-native/navigation}/src/components/Screen.tsx (100%) rename {packages/suite-native-navigation => suite-native/navigation}/src/components/ScreenHeader.tsx (100%) rename {packages/suite-native-navigation => suite-native/navigation}/src/components/TabBar.tsx (100%) rename {packages/suite-native-navigation => suite-native/navigation}/src/components/TabBarItem.tsx (100%) rename {packages/suite-native-navigation => suite-native/navigation}/src/config.ts (100%) rename {packages/suite-native-navigation => suite-native/navigation}/src/index.ts (100%) rename {packages/suite-native-navigation => suite-native/navigation}/src/types.tsx (100%) create mode 100644 suite-native/navigation/tsconfig.json diff --git a/.dockerignore b/.dockerignore index cf7395b6efd..a7fdf6593ac 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,6 +1,7 @@ packages/**/node_modules packages/blockchain-link packages/suite-desktop -packages/suite-native +suite-native/app +suite-native/**/node_modules node_modules -.git \ No newline at end of file +.git diff --git a/CODEOWNERS b/CODEOWNERS index 7a645d7d299..08b6742f3ff 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -46,9 +46,7 @@ /packages/suite-desktop-api @szymonlesisz @marekrjpolak -/packages/suite-native @matejkriz @Nodonisko - -/packages/suite-native-* @Nodonisko @bouchja1 @juriczech +/suite-native @Nodonisko @bouchja1 @juriczech /packages/suite-storage @matejkriz diff --git a/README.md b/README.md index a4d4497ae63..ef432556beb 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ | [@trezor/suite-data](./packages/suite-data) | suite static data | | [@trezor/suite-desktop-api](./packages/suite-desktop-api) | API for suite - suite-desktop communication | | [@trezor/suite-desktop](./packages/suite-desktop) | suite build target for Mac, Win, Linux | -| [@trezor/suite-native](./packages/suite-native) | suite build target for react-native | +| [@trezor/suite-native](./suite-native/app) | suite build target for react-native | | [@trezor/suite-storage](./packages/suite-storage) | abstract database definition for suite | | [@trezor/suite-web-landing](./packages/suite-web-landing) | https://suite.trezor.io/ | | [@trezor/suite-web](./packages/suite-web) | suite build target for web | @@ -49,7 +49,7 @@ Before you start make sure you have downloaded and installed [NVM](https://githu - `yarn` - `yarn build:libs && yarn workspace @trezor/suite-data msg-system-sign-config` -_To set up your dev environment for a native platform (iOS/Android) follow [these additional steps](https://github.com/trezor/trezor-suite/tree/develop/packages/suite-native#development)._ +_To set up your dev environment for a native platform (iOS/Android) follow [these additional steps](https://github.com/trezor/trezor-suite/tree/develop/suite-native/app#development)._ Run a dev build: diff --git a/ci/build.yml b/ci/build.yml index f13a3e6fd76..796b06932c4 100644 --- a/ci/build.yml +++ b/ci/build.yml @@ -283,7 +283,7 @@ suite-native build android: - yarn install --frozen-lockfile --cache-folder .yarn --prefer-offline - yarn workspace @trezor/suite-data copy-static-files - yarn workspace @trezor/suite-native build:android - - mv packages/suite-native/android/app/build/outputs/apk/dev/debug/app-dev-debug.apk . + - mv suite-native/app/android/app/build/outputs/apk/dev/debug/app-dev-debug.apk . artifacts: expire_in: 7 day paths: diff --git a/lerna.json b/lerna.json index fb2a657f64e..c1e6829ec48 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "packages": ["packages/*", "scripts"], + "packages": ["packages/*", "suite-native/*", "scripts"], "npmClient": "yarn", "useWorkspaces": true, "version": "independent" diff --git a/package.json b/package.json index b91f499e8db..8f396dca569 100644 --- a/package.json +++ b/package.json @@ -11,6 +11,7 @@ "workspaces": { "packages": [ "packages/*", + "suite-native/*", "scripts" ], "nohoist": [ diff --git a/packages/connect-plugin-ethereum/__tests__/index.test.ts b/packages/connect-plugin-ethereum/__tests__/index.test.ts index c98bf3342aa..ef5dbc534b0 100644 --- a/packages/connect-plugin-ethereum/__tests__/index.test.ts +++ b/packages/connect-plugin-ethereum/__tests__/index.test.ts @@ -12,8 +12,8 @@ function messageToHex(string: string) { describe('typedData', () => { commonFixtures.tests - .filter(test => test.parameters.metamask_v4_compat) - .forEach(test => { + .filter((test: any) => test.parameters.metamask_v4_compat) + .forEach((test: any) => { it('typedData to message_hash and domain_separator_hash', () => { const transformed = transformTypedData( // @ts-ignore JSON.. diff --git a/packages/suite-native-home/tsconfig.json b/packages/suite-native-home/tsconfig.json deleted file mode 100644 index 461451888eb..00000000000 --- a/packages/suite-native-home/tsconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { "outDir": "libDev" }, - "references": [ - { "path": "../suite-native-navigation" }, - { "path": "../suite-native-atoms" }, - { "path": "../styles" } - ] -} diff --git a/packages/suite-native-navigation-root/tsconfig.json b/packages/suite-native-navigation-root/tsconfig.json deleted file mode 100644 index 0a289ed4f06..00000000000 --- a/packages/suite-native-navigation-root/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { "outDir": "libDev" }, - "references": [ - { "path": "../suite-native-settings" }, - { "path": "../suite-native-navigation" }, - { "path": "../suite-native-atoms" }, - { "path": "../icons" }, - { "path": "../styles" } - ] -} diff --git a/packages/suite-native-settings/tsconfig.json b/packages/suite-native-settings/tsconfig.json deleted file mode 100644 index 461451888eb..00000000000 --- a/packages/suite-native-settings/tsconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { "outDir": "libDev" }, - "references": [ - { "path": "../suite-native-navigation" }, - { "path": "../suite-native-atoms" }, - { "path": "../styles" } - ] -} diff --git a/packages/suite-native/tsconfig.json b/packages/suite-native/tsconfig.json deleted file mode 100644 index cf98a901d19..00000000000 --- a/packages/suite-native/tsconfig.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "extends": "../../tsconfig.json", - "compilerOptions": { "outDir": "libDev" }, - "references": [ - { "path": "../suite-native-atoms" }, - { - "path": "../suite-native-navigation-root" - }, - { "path": "../connect" }, - { "path": "../styles" }, - { "path": "../theme" }, - { "path": "../transport-native" } - ], - "include": [".", "**.json"] -} diff --git a/packages/suite-native/.buckconfig b/suite-native/app/.buckconfig similarity index 100% rename from packages/suite-native/.buckconfig rename to suite-native/app/.buckconfig diff --git a/packages/suite-native/.eslintrc.js b/suite-native/app/.eslintrc.js similarity index 100% rename from packages/suite-native/.eslintrc.js rename to suite-native/app/.eslintrc.js diff --git a/packages/suite-native/.gitignore b/suite-native/app/.gitignore similarity index 100% rename from packages/suite-native/.gitignore rename to suite-native/app/.gitignore diff --git a/packages/suite-native/.watchmanconfig b/suite-native/app/.watchmanconfig similarity index 100% rename from packages/suite-native/.watchmanconfig rename to suite-native/app/.watchmanconfig diff --git a/packages/suite-native/Gemfile b/suite-native/app/Gemfile similarity index 100% rename from packages/suite-native/Gemfile rename to suite-native/app/Gemfile diff --git a/packages/suite-native/Gemfile.lock b/suite-native/app/Gemfile.lock similarity index 100% rename from packages/suite-native/Gemfile.lock rename to suite-native/app/Gemfile.lock diff --git a/packages/suite-native/README.md b/suite-native/app/README.md similarity index 100% rename from packages/suite-native/README.md rename to suite-native/app/README.md diff --git a/packages/suite-native/_bundle/config b/suite-native/app/_bundle/config similarity index 100% rename from packages/suite-native/_bundle/config rename to suite-native/app/_bundle/config diff --git a/packages/suite-native/_ruby-version b/suite-native/app/_ruby-version similarity index 100% rename from packages/suite-native/_ruby-version rename to suite-native/app/_ruby-version diff --git a/packages/suite-native/android/app/_BUCK b/suite-native/app/android/app/_BUCK similarity index 100% rename from packages/suite-native/android/app/_BUCK rename to suite-native/app/android/app/_BUCK diff --git a/packages/suite-native/android/app/build.gradle b/suite-native/app/android/app/build.gradle similarity index 99% rename from packages/suite-native/android/app/build.gradle rename to suite-native/app/android/app/build.gradle index d0c58330ab5..94621a9804a 100644 --- a/packages/suite-native/android/app/build.gradle +++ b/suite-native/app/android/app/build.gradle @@ -87,7 +87,7 @@ project.ext.react = [ hermesCommand: "../../../../node_modules/hermes-engine/%OS-BIN%/hermesc", composeSourceMapsPath: "../../node_modules/react-native/scripts/compose-source-maps.js", cliPath: "../../../../node_modules/react-native/cli.js", - entryFile: "packages/suite-native/index.js", + entryFile: "suite-native/app/index.js", reactRoot: "../../../../" ] diff --git a/packages/suite-native/android/app/build_defs.bzl b/suite-native/app/android/app/build_defs.bzl similarity index 100% rename from packages/suite-native/android/app/build_defs.bzl rename to suite-native/app/android/app/build_defs.bzl diff --git a/packages/suite-native/android/app/debug.keystore b/suite-native/app/android/app/debug.keystore similarity index 100% rename from packages/suite-native/android/app/debug.keystore rename to suite-native/app/android/app/debug.keystore diff --git a/packages/suite-native/android/app/proguard-rules.pro b/suite-native/app/android/app/proguard-rules.pro similarity index 100% rename from packages/suite-native/android/app/proguard-rules.pro rename to suite-native/app/android/app/proguard-rules.pro diff --git a/packages/suite-native/android/app/src/debug/AndroidManifest.xml b/suite-native/app/android/app/src/debug/AndroidManifest.xml similarity index 100% rename from packages/suite-native/android/app/src/debug/AndroidManifest.xml rename to suite-native/app/android/app/src/debug/AndroidManifest.xml diff --git a/packages/suite-native/android/app/src/debug/java/io/trezor/suite/ReactNativeFlipper.java b/suite-native/app/android/app/src/debug/java/io/trezor/suite/ReactNativeFlipper.java similarity index 100% rename from packages/suite-native/android/app/src/debug/java/io/trezor/suite/ReactNativeFlipper.java rename to suite-native/app/android/app/src/debug/java/io/trezor/suite/ReactNativeFlipper.java diff --git a/packages/suite-native/android/app/src/dev/res/drawable/ic_launcher_foreground.xml b/suite-native/app/android/app/src/dev/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from packages/suite-native/android/app/src/dev/res/drawable/ic_launcher_foreground.xml rename to suite-native/app/android/app/src/dev/res/drawable/ic_launcher_foreground.xml diff --git a/packages/suite-native/android/app/src/dev/res/mipmap-anydpi-v26/ic_launcher.xml b/suite-native/app/android/app/src/dev/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from packages/suite-native/android/app/src/dev/res/mipmap-anydpi-v26/ic_launcher.xml rename to suite-native/app/android/app/src/dev/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/packages/suite-native/android/app/src/dev/res/mipmap-anydpi-v26/ic_launcher_round.xml b/suite-native/app/android/app/src/dev/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from packages/suite-native/android/app/src/dev/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to suite-native/app/android/app/src/dev/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/packages/suite-native/android/app/src/dev/res/mipmap-hdpi/ic_launcher.png b/suite-native/app/android/app/src/dev/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from packages/suite-native/android/app/src/dev/res/mipmap-hdpi/ic_launcher.png rename to suite-native/app/android/app/src/dev/res/mipmap-hdpi/ic_launcher.png diff --git a/packages/suite-native/android/app/src/dev/res/mipmap-hdpi/ic_launcher_round.png b/suite-native/app/android/app/src/dev/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from packages/suite-native/android/app/src/dev/res/mipmap-hdpi/ic_launcher_round.png rename to suite-native/app/android/app/src/dev/res/mipmap-hdpi/ic_launcher_round.png diff --git a/packages/suite-native/android/app/src/dev/res/mipmap-mdpi/ic_launcher.png b/suite-native/app/android/app/src/dev/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from packages/suite-native/android/app/src/dev/res/mipmap-mdpi/ic_launcher.png rename to suite-native/app/android/app/src/dev/res/mipmap-mdpi/ic_launcher.png diff --git a/packages/suite-native/android/app/src/dev/res/mipmap-mdpi/ic_launcher_round.png b/suite-native/app/android/app/src/dev/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from packages/suite-native/android/app/src/dev/res/mipmap-mdpi/ic_launcher_round.png rename to suite-native/app/android/app/src/dev/res/mipmap-mdpi/ic_launcher_round.png diff --git a/packages/suite-native/android/app/src/dev/res/mipmap-xhdpi/ic_launcher.png b/suite-native/app/android/app/src/dev/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from packages/suite-native/android/app/src/dev/res/mipmap-xhdpi/ic_launcher.png rename to suite-native/app/android/app/src/dev/res/mipmap-xhdpi/ic_launcher.png diff --git a/packages/suite-native/android/app/src/dev/res/mipmap-xhdpi/ic_launcher_round.png b/suite-native/app/android/app/src/dev/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from packages/suite-native/android/app/src/dev/res/mipmap-xhdpi/ic_launcher_round.png rename to suite-native/app/android/app/src/dev/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/packages/suite-native/android/app/src/dev/res/mipmap-xxhdpi/ic_launcher.png b/suite-native/app/android/app/src/dev/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from packages/suite-native/android/app/src/dev/res/mipmap-xxhdpi/ic_launcher.png rename to suite-native/app/android/app/src/dev/res/mipmap-xxhdpi/ic_launcher.png diff --git a/packages/suite-native/android/app/src/dev/res/mipmap-xxhdpi/ic_launcher_round.png b/suite-native/app/android/app/src/dev/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from packages/suite-native/android/app/src/dev/res/mipmap-xxhdpi/ic_launcher_round.png rename to suite-native/app/android/app/src/dev/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/packages/suite-native/android/app/src/dev/res/mipmap-xxxhdpi/ic_launcher.png b/suite-native/app/android/app/src/dev/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from packages/suite-native/android/app/src/dev/res/mipmap-xxxhdpi/ic_launcher.png rename to suite-native/app/android/app/src/dev/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/packages/suite-native/android/app/src/dev/res/mipmap-xxxhdpi/ic_launcher_round.png b/suite-native/app/android/app/src/dev/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from packages/suite-native/android/app/src/dev/res/mipmap-xxxhdpi/ic_launcher_round.png rename to suite-native/app/android/app/src/dev/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/packages/suite-native/android/app/src/dev/res/values/strings.xml b/suite-native/app/android/app/src/dev/res/values/strings.xml similarity index 100% rename from packages/suite-native/android/app/src/dev/res/values/strings.xml rename to suite-native/app/android/app/src/dev/res/values/strings.xml diff --git a/packages/suite-native/android/app/src/firebaseDevelop/google-services.json b/suite-native/app/android/app/src/firebaseDevelop/google-services.json similarity index 100% rename from packages/suite-native/android/app/src/firebaseDevelop/google-services.json rename to suite-native/app/android/app/src/firebaseDevelop/google-services.json diff --git a/packages/suite-native/android/app/src/firebaseDevelop/res/drawable/ic_launcher_foreground.xml b/suite-native/app/android/app/src/firebaseDevelop/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from packages/suite-native/android/app/src/firebaseDevelop/res/drawable/ic_launcher_foreground.xml rename to suite-native/app/android/app/src/firebaseDevelop/res/drawable/ic_launcher_foreground.xml diff --git a/packages/suite-native/android/app/src/firebaseDevelop/res/mipmap-anydpi-v26/ic_launcher.xml b/suite-native/app/android/app/src/firebaseDevelop/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from packages/suite-native/android/app/src/firebaseDevelop/res/mipmap-anydpi-v26/ic_launcher.xml rename to suite-native/app/android/app/src/firebaseDevelop/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/packages/suite-native/android/app/src/firebaseDevelop/res/mipmap-anydpi-v26/ic_launcher_round.xml b/suite-native/app/android/app/src/firebaseDevelop/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from packages/suite-native/android/app/src/firebaseDevelop/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to suite-native/app/android/app/src/firebaseDevelop/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/packages/suite-native/android/app/src/firebaseDevelop/res/mipmap-hdpi/ic_launcher.png b/suite-native/app/android/app/src/firebaseDevelop/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from packages/suite-native/android/app/src/firebaseDevelop/res/mipmap-hdpi/ic_launcher.png rename to suite-native/app/android/app/src/firebaseDevelop/res/mipmap-hdpi/ic_launcher.png diff --git a/packages/suite-native/android/app/src/firebaseDevelop/res/mipmap-hdpi/ic_launcher_round.png b/suite-native/app/android/app/src/firebaseDevelop/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from packages/suite-native/android/app/src/firebaseDevelop/res/mipmap-hdpi/ic_launcher_round.png rename to suite-native/app/android/app/src/firebaseDevelop/res/mipmap-hdpi/ic_launcher_round.png diff --git a/packages/suite-native/android/app/src/firebaseDevelop/res/mipmap-mdpi/ic_launcher.png b/suite-native/app/android/app/src/firebaseDevelop/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from packages/suite-native/android/app/src/firebaseDevelop/res/mipmap-mdpi/ic_launcher.png rename to suite-native/app/android/app/src/firebaseDevelop/res/mipmap-mdpi/ic_launcher.png diff --git a/packages/suite-native/android/app/src/firebaseDevelop/res/mipmap-mdpi/ic_launcher_round.png b/suite-native/app/android/app/src/firebaseDevelop/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from packages/suite-native/android/app/src/firebaseDevelop/res/mipmap-mdpi/ic_launcher_round.png rename to suite-native/app/android/app/src/firebaseDevelop/res/mipmap-mdpi/ic_launcher_round.png diff --git a/packages/suite-native/android/app/src/firebaseDevelop/res/mipmap-xhdpi/ic_launcher.png b/suite-native/app/android/app/src/firebaseDevelop/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from packages/suite-native/android/app/src/firebaseDevelop/res/mipmap-xhdpi/ic_launcher.png rename to suite-native/app/android/app/src/firebaseDevelop/res/mipmap-xhdpi/ic_launcher.png diff --git a/packages/suite-native/android/app/src/firebaseDevelop/res/mipmap-xhdpi/ic_launcher_round.png b/suite-native/app/android/app/src/firebaseDevelop/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from packages/suite-native/android/app/src/firebaseDevelop/res/mipmap-xhdpi/ic_launcher_round.png rename to suite-native/app/android/app/src/firebaseDevelop/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/packages/suite-native/android/app/src/firebaseDevelop/res/mipmap-xxhdpi/ic_launcher.png b/suite-native/app/android/app/src/firebaseDevelop/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from packages/suite-native/android/app/src/firebaseDevelop/res/mipmap-xxhdpi/ic_launcher.png rename to suite-native/app/android/app/src/firebaseDevelop/res/mipmap-xxhdpi/ic_launcher.png diff --git a/packages/suite-native/android/app/src/firebaseDevelop/res/mipmap-xxhdpi/ic_launcher_round.png b/suite-native/app/android/app/src/firebaseDevelop/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from packages/suite-native/android/app/src/firebaseDevelop/res/mipmap-xxhdpi/ic_launcher_round.png rename to suite-native/app/android/app/src/firebaseDevelop/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/packages/suite-native/android/app/src/firebaseDevelop/res/mipmap-xxxhdpi/ic_launcher.png b/suite-native/app/android/app/src/firebaseDevelop/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from packages/suite-native/android/app/src/firebaseDevelop/res/mipmap-xxxhdpi/ic_launcher.png rename to suite-native/app/android/app/src/firebaseDevelop/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/packages/suite-native/android/app/src/firebaseDevelop/res/mipmap-xxxhdpi/ic_launcher_round.png b/suite-native/app/android/app/src/firebaseDevelop/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from packages/suite-native/android/app/src/firebaseDevelop/res/mipmap-xxxhdpi/ic_launcher_round.png rename to suite-native/app/android/app/src/firebaseDevelop/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/packages/suite-native/android/app/src/firebaseDevelop/res/values/strings.xml b/suite-native/app/android/app/src/firebaseDevelop/res/values/strings.xml similarity index 100% rename from packages/suite-native/android/app/src/firebaseDevelop/res/values/strings.xml rename to suite-native/app/android/app/src/firebaseDevelop/res/values/strings.xml diff --git a/packages/suite-native/android/app/src/firebaseStaging/res/drawable/ic_launcher_foreground.xml b/suite-native/app/android/app/src/firebaseStaging/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from packages/suite-native/android/app/src/firebaseStaging/res/drawable/ic_launcher_foreground.xml rename to suite-native/app/android/app/src/firebaseStaging/res/drawable/ic_launcher_foreground.xml diff --git a/packages/suite-native/android/app/src/firebaseStaging/res/mipmap-anydpi-v26/ic_launcher.xml b/suite-native/app/android/app/src/firebaseStaging/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from packages/suite-native/android/app/src/firebaseStaging/res/mipmap-anydpi-v26/ic_launcher.xml rename to suite-native/app/android/app/src/firebaseStaging/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/packages/suite-native/android/app/src/firebaseStaging/res/mipmap-anydpi-v26/ic_launcher_round.xml b/suite-native/app/android/app/src/firebaseStaging/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from packages/suite-native/android/app/src/firebaseStaging/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to suite-native/app/android/app/src/firebaseStaging/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/packages/suite-native/android/app/src/firebaseStaging/res/mipmap-hdpi/ic_launcher.png b/suite-native/app/android/app/src/firebaseStaging/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from packages/suite-native/android/app/src/firebaseStaging/res/mipmap-hdpi/ic_launcher.png rename to suite-native/app/android/app/src/firebaseStaging/res/mipmap-hdpi/ic_launcher.png diff --git a/packages/suite-native/android/app/src/firebaseStaging/res/mipmap-hdpi/ic_launcher_round.png b/suite-native/app/android/app/src/firebaseStaging/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from packages/suite-native/android/app/src/firebaseStaging/res/mipmap-hdpi/ic_launcher_round.png rename to suite-native/app/android/app/src/firebaseStaging/res/mipmap-hdpi/ic_launcher_round.png diff --git a/packages/suite-native/android/app/src/firebaseStaging/res/mipmap-mdpi/ic_launcher.png b/suite-native/app/android/app/src/firebaseStaging/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from packages/suite-native/android/app/src/firebaseStaging/res/mipmap-mdpi/ic_launcher.png rename to suite-native/app/android/app/src/firebaseStaging/res/mipmap-mdpi/ic_launcher.png diff --git a/packages/suite-native/android/app/src/firebaseStaging/res/mipmap-mdpi/ic_launcher_round.png b/suite-native/app/android/app/src/firebaseStaging/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from packages/suite-native/android/app/src/firebaseStaging/res/mipmap-mdpi/ic_launcher_round.png rename to suite-native/app/android/app/src/firebaseStaging/res/mipmap-mdpi/ic_launcher_round.png diff --git a/packages/suite-native/android/app/src/firebaseStaging/res/mipmap-xhdpi/ic_launcher.png b/suite-native/app/android/app/src/firebaseStaging/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from packages/suite-native/android/app/src/firebaseStaging/res/mipmap-xhdpi/ic_launcher.png rename to suite-native/app/android/app/src/firebaseStaging/res/mipmap-xhdpi/ic_launcher.png diff --git a/packages/suite-native/android/app/src/firebaseStaging/res/mipmap-xhdpi/ic_launcher_round.png b/suite-native/app/android/app/src/firebaseStaging/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from packages/suite-native/android/app/src/firebaseStaging/res/mipmap-xhdpi/ic_launcher_round.png rename to suite-native/app/android/app/src/firebaseStaging/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/packages/suite-native/android/app/src/firebaseStaging/res/mipmap-xxhdpi/ic_launcher.png b/suite-native/app/android/app/src/firebaseStaging/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from packages/suite-native/android/app/src/firebaseStaging/res/mipmap-xxhdpi/ic_launcher.png rename to suite-native/app/android/app/src/firebaseStaging/res/mipmap-xxhdpi/ic_launcher.png diff --git a/packages/suite-native/android/app/src/firebaseStaging/res/mipmap-xxhdpi/ic_launcher_round.png b/suite-native/app/android/app/src/firebaseStaging/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from packages/suite-native/android/app/src/firebaseStaging/res/mipmap-xxhdpi/ic_launcher_round.png rename to suite-native/app/android/app/src/firebaseStaging/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/packages/suite-native/android/app/src/firebaseStaging/res/mipmap-xxxhdpi/ic_launcher.png b/suite-native/app/android/app/src/firebaseStaging/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from packages/suite-native/android/app/src/firebaseStaging/res/mipmap-xxxhdpi/ic_launcher.png rename to suite-native/app/android/app/src/firebaseStaging/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/packages/suite-native/android/app/src/firebaseStaging/res/mipmap-xxxhdpi/ic_launcher_round.png b/suite-native/app/android/app/src/firebaseStaging/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from packages/suite-native/android/app/src/firebaseStaging/res/mipmap-xxxhdpi/ic_launcher_round.png rename to suite-native/app/android/app/src/firebaseStaging/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/packages/suite-native/android/app/src/firebaseStaging/res/values/strings.xml b/suite-native/app/android/app/src/firebaseStaging/res/values/strings.xml similarity index 100% rename from packages/suite-native/android/app/src/firebaseStaging/res/values/strings.xml rename to suite-native/app/android/app/src/firebaseStaging/res/values/strings.xml diff --git a/packages/suite-native/android/app/src/main/AndroidManifest.xml b/suite-native/app/android/app/src/main/AndroidManifest.xml similarity index 100% rename from packages/suite-native/android/app/src/main/AndroidManifest.xml rename to suite-native/app/android/app/src/main/AndroidManifest.xml diff --git a/packages/suite-native/android/app/src/main/assets/fonts/TTSatoshi-Bold.otf b/suite-native/app/android/app/src/main/assets/fonts/TTSatoshi-Bold.otf similarity index 100% rename from packages/suite-native/android/app/src/main/assets/fonts/TTSatoshi-Bold.otf rename to suite-native/app/android/app/src/main/assets/fonts/TTSatoshi-Bold.otf diff --git a/packages/suite-native/android/app/src/main/assets/fonts/TTSatoshi-DemiBold.otf b/suite-native/app/android/app/src/main/assets/fonts/TTSatoshi-DemiBold.otf similarity index 100% rename from packages/suite-native/android/app/src/main/assets/fonts/TTSatoshi-DemiBold.otf rename to suite-native/app/android/app/src/main/assets/fonts/TTSatoshi-DemiBold.otf diff --git a/packages/suite-native/android/app/src/main/assets/fonts/TTSatoshi-Medium.otf b/suite-native/app/android/app/src/main/assets/fonts/TTSatoshi-Medium.otf similarity index 100% rename from packages/suite-native/android/app/src/main/assets/fonts/TTSatoshi-Medium.otf rename to suite-native/app/android/app/src/main/assets/fonts/TTSatoshi-Medium.otf diff --git a/packages/suite-native/android/app/src/main/assets/fonts/TTSatoshi-Regular.otf b/suite-native/app/android/app/src/main/assets/fonts/TTSatoshi-Regular.otf similarity index 100% rename from packages/suite-native/android/app/src/main/assets/fonts/TTSatoshi-Regular.otf rename to suite-native/app/android/app/src/main/assets/fonts/TTSatoshi-Regular.otf diff --git a/packages/suite-native/android/app/src/main/java/io/trezor/suite/MainActivity.java b/suite-native/app/android/app/src/main/java/io/trezor/suite/MainActivity.java similarity index 100% rename from packages/suite-native/android/app/src/main/java/io/trezor/suite/MainActivity.java rename to suite-native/app/android/app/src/main/java/io/trezor/suite/MainActivity.java diff --git a/packages/suite-native/android/app/src/main/java/io/trezor/suite/MainApplication.java b/suite-native/app/android/app/src/main/java/io/trezor/suite/MainApplication.java similarity index 98% rename from packages/suite-native/android/app/src/main/java/io/trezor/suite/MainApplication.java rename to suite-native/app/android/app/src/main/java/io/trezor/suite/MainApplication.java index 37aab25fe65..fe547e2551f 100644 --- a/packages/suite-native/android/app/src/main/java/io/trezor/suite/MainApplication.java +++ b/suite-native/app/android/app/src/main/java/io/trezor/suite/MainApplication.java @@ -33,7 +33,7 @@ protected List getPackages() { @Override protected String getJSMainModuleName() { - return "packages/suite-native/index"; + return "suite-native/app/index"; } }; diff --git a/packages/suite-native/android/app/src/main/java/io/trezor/suite/newarchitecture/MainApplicationReactNativeHost.java b/suite-native/app/android/app/src/main/java/io/trezor/suite/newarchitecture/MainApplicationReactNativeHost.java similarity index 99% rename from packages/suite-native/android/app/src/main/java/io/trezor/suite/newarchitecture/MainApplicationReactNativeHost.java rename to suite-native/app/android/app/src/main/java/io/trezor/suite/newarchitecture/MainApplicationReactNativeHost.java index 7195bb2a502..8643e431d97 100644 --- a/packages/suite-native/android/app/src/main/java/io/trezor/suite/newarchitecture/MainApplicationReactNativeHost.java +++ b/suite-native/app/android/app/src/main/java/io/trezor/suite/newarchitecture/MainApplicationReactNativeHost.java @@ -56,7 +56,7 @@ protected List getPackages() { @Override protected String getJSMainModuleName() { - return "packages/suite-native/index"; + return "suite-native/app/index"; } @NonNull diff --git a/packages/suite-native/android/app/src/main/java/io/trezor/suite/newarchitecture/components/MainComponentsRegistry.java b/suite-native/app/android/app/src/main/java/io/trezor/suite/newarchitecture/components/MainComponentsRegistry.java similarity index 100% rename from packages/suite-native/android/app/src/main/java/io/trezor/suite/newarchitecture/components/MainComponentsRegistry.java rename to suite-native/app/android/app/src/main/java/io/trezor/suite/newarchitecture/components/MainComponentsRegistry.java diff --git a/packages/suite-native/android/app/src/main/java/io/trezor/suite/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java b/suite-native/app/android/app/src/main/java/io/trezor/suite/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java similarity index 100% rename from packages/suite-native/android/app/src/main/java/io/trezor/suite/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java rename to suite-native/app/android/app/src/main/java/io/trezor/suite/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java diff --git a/packages/suite-native/android/app/src/main/jni/Android.mk b/suite-native/app/android/app/src/main/jni/Android.mk similarity index 100% rename from packages/suite-native/android/app/src/main/jni/Android.mk rename to suite-native/app/android/app/src/main/jni/Android.mk diff --git a/packages/suite-native/android/app/src/main/jni/MainApplicationModuleProvider.cpp b/suite-native/app/android/app/src/main/jni/MainApplicationModuleProvider.cpp similarity index 100% rename from packages/suite-native/android/app/src/main/jni/MainApplicationModuleProvider.cpp rename to suite-native/app/android/app/src/main/jni/MainApplicationModuleProvider.cpp diff --git a/packages/suite-native/android/app/src/main/jni/MainApplicationModuleProvider.h b/suite-native/app/android/app/src/main/jni/MainApplicationModuleProvider.h similarity index 100% rename from packages/suite-native/android/app/src/main/jni/MainApplicationModuleProvider.h rename to suite-native/app/android/app/src/main/jni/MainApplicationModuleProvider.h diff --git a/packages/suite-native/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp b/suite-native/app/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp similarity index 100% rename from packages/suite-native/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp rename to suite-native/app/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp diff --git a/packages/suite-native/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h b/suite-native/app/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h similarity index 100% rename from packages/suite-native/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h rename to suite-native/app/android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h diff --git a/packages/suite-native/android/app/src/main/jni/MainComponentsRegistry.cpp b/suite-native/app/android/app/src/main/jni/MainComponentsRegistry.cpp similarity index 100% rename from packages/suite-native/android/app/src/main/jni/MainComponentsRegistry.cpp rename to suite-native/app/android/app/src/main/jni/MainComponentsRegistry.cpp diff --git a/packages/suite-native/android/app/src/main/jni/MainComponentsRegistry.h b/suite-native/app/android/app/src/main/jni/MainComponentsRegistry.h similarity index 100% rename from packages/suite-native/android/app/src/main/jni/MainComponentsRegistry.h rename to suite-native/app/android/app/src/main/jni/MainComponentsRegistry.h diff --git a/packages/suite-native/android/app/src/main/jni/OnLoad.cpp b/suite-native/app/android/app/src/main/jni/OnLoad.cpp similarity index 100% rename from packages/suite-native/android/app/src/main/jni/OnLoad.cpp rename to suite-native/app/android/app/src/main/jni/OnLoad.cpp diff --git a/packages/suite-native/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/suite-native/app/android/app/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from packages/suite-native/android/app/src/main/res/drawable/ic_launcher_foreground.xml rename to suite-native/app/android/app/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/packages/suite-native/android/app/src/main/res/drawable/rn_edit_text_material.xml b/suite-native/app/android/app/src/main/res/drawable/rn_edit_text_material.xml similarity index 100% rename from packages/suite-native/android/app/src/main/res/drawable/rn_edit_text_material.xml rename to suite-native/app/android/app/src/main/res/drawable/rn_edit_text_material.xml diff --git a/packages/suite-native/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/suite-native/app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from packages/suite-native/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to suite-native/app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/packages/suite-native/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/suite-native/app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from packages/suite-native/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to suite-native/app/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/packages/suite-native/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/suite-native/app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from packages/suite-native/android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to suite-native/app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/packages/suite-native/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/suite-native/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from packages/suite-native/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to suite-native/app/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/packages/suite-native/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/suite-native/app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from packages/suite-native/android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to suite-native/app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/packages/suite-native/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/suite-native/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from packages/suite-native/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to suite-native/app/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/packages/suite-native/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/suite-native/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from packages/suite-native/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to suite-native/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/packages/suite-native/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/suite-native/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from packages/suite-native/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to suite-native/app/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/packages/suite-native/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/suite-native/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from packages/suite-native/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to suite-native/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/packages/suite-native/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/suite-native/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from packages/suite-native/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to suite-native/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/packages/suite-native/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/suite-native/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from packages/suite-native/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to suite-native/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/packages/suite-native/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/suite-native/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from packages/suite-native/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to suite-native/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/packages/suite-native/android/app/src/main/res/values/ic_launcher_background.xml b/suite-native/app/android/app/src/main/res/values/ic_launcher_background.xml similarity index 100% rename from packages/suite-native/android/app/src/main/res/values/ic_launcher_background.xml rename to suite-native/app/android/app/src/main/res/values/ic_launcher_background.xml diff --git a/packages/suite-native/android/app/src/main/res/values/strings.xml b/suite-native/app/android/app/src/main/res/values/strings.xml similarity index 100% rename from packages/suite-native/android/app/src/main/res/values/strings.xml rename to suite-native/app/android/app/src/main/res/values/strings.xml diff --git a/packages/suite-native/android/app/src/main/res/values/styles.xml b/suite-native/app/android/app/src/main/res/values/styles.xml similarity index 100% rename from packages/suite-native/android/app/src/main/res/values/styles.xml rename to suite-native/app/android/app/src/main/res/values/styles.xml diff --git a/packages/suite-native/android/build.gradle b/suite-native/app/android/build.gradle similarity index 100% rename from packages/suite-native/android/build.gradle rename to suite-native/app/android/build.gradle diff --git a/packages/suite-native/android/fastlane/Fastfile b/suite-native/app/android/fastlane/Fastfile similarity index 100% rename from packages/suite-native/android/fastlane/Fastfile rename to suite-native/app/android/fastlane/Fastfile diff --git a/packages/suite-native/android/gradle.properties b/suite-native/app/android/gradle.properties similarity index 100% rename from packages/suite-native/android/gradle.properties rename to suite-native/app/android/gradle.properties diff --git a/packages/suite-native/android/gradle/wrapper/gradle-wrapper.jar b/suite-native/app/android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from packages/suite-native/android/gradle/wrapper/gradle-wrapper.jar rename to suite-native/app/android/gradle/wrapper/gradle-wrapper.jar diff --git a/packages/suite-native/android/gradle/wrapper/gradle-wrapper.properties b/suite-native/app/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from packages/suite-native/android/gradle/wrapper/gradle-wrapper.properties rename to suite-native/app/android/gradle/wrapper/gradle-wrapper.properties diff --git a/packages/suite-native/android/gradlew b/suite-native/app/android/gradlew similarity index 100% rename from packages/suite-native/android/gradlew rename to suite-native/app/android/gradlew diff --git a/packages/suite-native/android/gradlew.bat b/suite-native/app/android/gradlew.bat similarity index 100% rename from packages/suite-native/android/gradlew.bat rename to suite-native/app/android/gradlew.bat diff --git a/packages/suite-native/android/settings.gradle b/suite-native/app/android/settings.gradle similarity index 100% rename from packages/suite-native/android/settings.gradle rename to suite-native/app/android/settings.gradle diff --git a/packages/suite-native/app.json b/suite-native/app/app.json similarity index 100% rename from packages/suite-native/app.json rename to suite-native/app/app.json diff --git a/packages/suite-native/babel.config.js b/suite-native/app/babel.config.js similarity index 100% rename from packages/suite-native/babel.config.js rename to suite-native/app/babel.config.js diff --git a/packages/suite-native/fastlane/Appfile b/suite-native/app/fastlane/Appfile similarity index 100% rename from packages/suite-native/fastlane/Appfile rename to suite-native/app/fastlane/Appfile diff --git a/packages/suite-native/fastlane/Fastfile b/suite-native/app/fastlane/Fastfile similarity index 100% rename from packages/suite-native/fastlane/Fastfile rename to suite-native/app/fastlane/Fastfile diff --git a/packages/suite-native/fastlane/Pluginfile b/suite-native/app/fastlane/Pluginfile similarity index 100% rename from packages/suite-native/fastlane/Pluginfile rename to suite-native/app/fastlane/Pluginfile diff --git a/packages/suite-native/files/app_icon_512x512.svg b/suite-native/app/files/app_icon_512x512.svg similarity index 100% rename from packages/suite-native/files/app_icon_512x512.svg rename to suite-native/app/files/app_icon_512x512.svg diff --git a/packages/suite-native/files/app_icon_512x512_dev.svg b/suite-native/app/files/app_icon_512x512_dev.svg similarity index 100% rename from packages/suite-native/files/app_icon_512x512_dev.svg rename to suite-native/app/files/app_icon_512x512_dev.svg diff --git a/packages/suite-native/files/app_icon_512x512_local.svg b/suite-native/app/files/app_icon_512x512_local.svg similarity index 100% rename from packages/suite-native/files/app_icon_512x512_local.svg rename to suite-native/app/files/app_icon_512x512_local.svg diff --git a/packages/suite-native/files/app_icon_512x512_stag.svg b/suite-native/app/files/app_icon_512x512_stag.svg similarity index 100% rename from packages/suite-native/files/app_icon_512x512_stag.svg rename to suite-native/app/files/app_icon_512x512_stag.svg diff --git a/packages/suite-native/globalPolyfills.js b/suite-native/app/globalPolyfills.js similarity index 100% rename from packages/suite-native/globalPolyfills.js rename to suite-native/app/globalPolyfills.js diff --git a/packages/suite-native/index.js b/suite-native/app/index.js similarity index 100% rename from packages/suite-native/index.js rename to suite-native/app/index.js diff --git a/packages/suite-native/ios/Podfile b/suite-native/app/ios/Podfile similarity index 100% rename from packages/suite-native/ios/Podfile rename to suite-native/app/ios/Podfile diff --git a/packages/suite-native/ios/Podfile.lock b/suite-native/app/ios/Podfile.lock similarity index 98% rename from packages/suite-native/ios/Podfile.lock rename to suite-native/app/ios/Podfile.lock index f0ca63032ee..c5fe26116d2 100644 --- a/packages/suite-native/ios/Podfile.lock +++ b/suite-native/app/ios/Podfile.lock @@ -502,7 +502,7 @@ DEPENDENCIES: - RNGestureHandler (from `../../../node_modules/react-native-gesture-handler`) - RNReanimated (from `../../../node_modules/react-native-reanimated`) - RNScreens (from `../../../node_modules/react-native-screens`) - - trezor-transport-native (from `../../transport-native`) + - trezor-transport-native (from `../../../packages/transport-native`) - Yoga (from `../../../node_modules/react-native/ReactCommon/yoga`) SPEC REPOS: @@ -598,16 +598,16 @@ EXTERNAL SOURCES: RNScreens: :path: "../../../node_modules/react-native-screens" trezor-transport-native: - :path: "../../transport-native" + :path: "../../../packages/transport-native" Yoga: :path: "../../../node_modules/react-native/ReactCommon/yoga" SPEC CHECKSUMS: - boost: 33822b9202be3240e51605d20431570aa3a6c58e + boost: a7c83b31436843459a1961bfd74b96033dc77234 CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99 - DoubleConversion: 5c2288575b9bd33de61ab847e51d0dca167323e7 + DoubleConversion: 831926d9b8bf8166fd87886c4abab286c2422662 FBLazyVector: a7a655862f6b09625d11c772296b01cd5164b648 - FBReactNativeSpec: b78cc13f35883189b62e306e7120e8f837e38bdb + FBReactNativeSpec: d8bedf13ce939219aacc80bbbe2675ce47f67e27 Flipper: 26fc4b7382499f1281eb8cb921e5c3ad6de91fe0 Flipper-Boost-iOSX: fd1e2b8cbef7e662a122412d7ac5f5bea715403c Flipper-DoubleConversion: 3d3d04a078d4f3a1b6c6916587f159dc11f232c4 @@ -618,11 +618,11 @@ SPEC CHECKSUMS: Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541 FlipperKit: cbdee19bdd4e7f05472a66ce290f1b729ba3cb86 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 - glog: 46667b3bfd7b7368ebbef149ba7e1d17a61a1b94 + glog: 476ee3e89abb49e07f822b48323c51c57124b572 hermes-engine: 84e3af1ea01dd7351ac5d8689cbbea1f9903ffc3 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c - RCT-Folly: 97ba718a5f53eedf76d63d51074d5a9ca1245029 + RCT-Folly: 4d8508a426467c48885f1151029bc15fa5d7b3b8 RCTRequired: 3e917ea5377751094f38145fdece525aa90545a0 RCTTypeSafety: c43c072a4bd60feb49a9570b0517892b4305c45e React: 176dd882de001854ced260fad41bb68a31aa4bd0 @@ -660,4 +660,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 0ea5d86384de3805e047aea50716e04878050b4f -COCOAPODS: 1.11.3 +COCOAPODS: 1.11.2 diff --git a/packages/suite-native/ios/TrezorSuite.xcodeproj/project.pbxproj b/suite-native/app/ios/TrezorSuite.xcodeproj/project.pbxproj similarity index 92% rename from packages/suite-native/ios/TrezorSuite.xcodeproj/project.pbxproj rename to suite-native/app/ios/TrezorSuite.xcodeproj/project.pbxproj index 41c2d1976fb..aa4377fcf48 100644 --- a/packages/suite-native/ios/TrezorSuite.xcodeproj/project.pbxproj +++ b/suite-native/app/ios/TrezorSuite.xcodeproj/project.pbxproj @@ -9,11 +9,15 @@ /* Begin PBXBuildFile section */ 00E356F31AD99517003FC87E /* TrezorSuiteTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* TrezorSuiteTests.m */; }; 0C80B921A6F3F58F76C31292 /* libPods-TrezorSuite.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DCACB8F33CDC322A6C60F78 /* libPods-TrezorSuite.a */; }; + 0EE2ADD303944494A5030793 /* TTSatoshi-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = EAD24AA6025640BB9F7C7B6B /* TTSatoshi-Medium.otf */; }; 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; + 295C649096E84360A861704B /* TTSatoshi-DemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 7A6230C034DE4586AD564C7F /* TTSatoshi-DemiBold.otf */; }; + 5C232FC7C0094224A35E1882 /* TTSatoshi-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = E70CFF92AAAE4DEF96F4931E /* TTSatoshi-Regular.otf */; }; 5EA58567F7C34D4BB4135E94 /* TTSatoshi-Medium.otf in Resources */ = {isa = PBXBuildFile; fileRef = A0E40F5120CB4E82AF6C1CA0 /* TTSatoshi-Medium.otf */; }; 7699B88040F8A987B510C191 /* libPods-TrezorSuite-TrezorSuiteTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-TrezorSuite-TrezorSuiteTests.a */; }; + 7F5F35C7F5874548A3B53457 /* TTSatoshi-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 97E677142EC34389AB5C8B52 /* TTSatoshi-Bold.otf */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; AE19C8EA249F4BC29A82736A /* TTSatoshi-DemiBold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 8BCDC7530653430F8480AEF1 /* TTSatoshi-DemiBold.otf */; }; B4528AB09CC346C49EB6347E /* TTSatoshi-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = 69A6D83EFA4747F2BABDFD0A /* TTSatoshi-Regular.otf */; }; @@ -45,12 +49,12 @@ 5709B34CF0A7D63546082F79 /* Pods-TrezorSuite.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TrezorSuite.release.xcconfig"; path = "Target Support Files/Pods-TrezorSuite/Pods-TrezorSuite.release.xcconfig"; sourceTree = ""; }; 5B7EB9410499542E8C5724F5 /* Pods-TrezorSuite-TrezorSuiteTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TrezorSuite-TrezorSuiteTests.debug.xcconfig"; path = "Target Support Files/Pods-TrezorSuite-TrezorSuiteTests/Pods-TrezorSuite-TrezorSuiteTests.debug.xcconfig"; sourceTree = ""; }; 5DCACB8F33CDC322A6C60F78 /* libPods-TrezorSuite.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-TrezorSuite.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - 69A6D83EFA4747F2BABDFD0A /* TTSatoshi-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "TTSatoshi-Regular.otf"; path = "../../theme/fonts/TTSatoshi-Regular.otf"; sourceTree = ""; }; + 7A6230C034DE4586AD564C7F /* TTSatoshi-DemiBold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TTSatoshi-DemiBold.otf"; path = "../../../packages/theme/fonts/TTSatoshi-DemiBold.otf"; sourceTree = ""; }; 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = TrezorSuite/LaunchScreen.storyboard; sourceTree = ""; }; 89C6BE57DB24E9ADA2F236DE /* Pods-TrezorSuite-TrezorSuiteTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TrezorSuite-TrezorSuiteTests.release.xcconfig"; path = "Target Support Files/Pods-TrezorSuite-TrezorSuiteTests/Pods-TrezorSuite-TrezorSuiteTests.release.xcconfig"; sourceTree = ""; }; - 8BCDC7530653430F8480AEF1 /* TTSatoshi-DemiBold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "TTSatoshi-DemiBold.otf"; path = "../../theme/fonts/TTSatoshi-DemiBold.otf"; sourceTree = ""; }; - 92AC1F3110C34E2F8264BEAE /* TTSatoshi-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "TTSatoshi-Bold.otf"; path = "../../theme/fonts/TTSatoshi-Bold.otf"; sourceTree = ""; }; - A0E40F5120CB4E82AF6C1CA0 /* TTSatoshi-Medium.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "TTSatoshi-Medium.otf"; path = "../../theme/fonts/TTSatoshi-Medium.otf"; sourceTree = ""; }; + 97E677142EC34389AB5C8B52 /* TTSatoshi-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TTSatoshi-Bold.otf"; path = "../../../packages/theme/fonts/TTSatoshi-Bold.otf"; sourceTree = ""; }; + E70CFF92AAAE4DEF96F4931E /* TTSatoshi-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TTSatoshi-Regular.otf"; path = "../../../packages/theme/fonts/TTSatoshi-Regular.otf"; sourceTree = ""; }; + EAD24AA6025640BB9F7C7B6B /* TTSatoshi-Medium.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TTSatoshi-Medium.otf"; path = "../../../packages/theme/fonts/TTSatoshi-Medium.otf"; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; /* End PBXFileReference section */ @@ -121,6 +125,10 @@ 8BCDC7530653430F8480AEF1 /* TTSatoshi-DemiBold.otf */, A0E40F5120CB4E82AF6C1CA0 /* TTSatoshi-Medium.otf */, 69A6D83EFA4747F2BABDFD0A /* TTSatoshi-Regular.otf */, + 97E677142EC34389AB5C8B52 /* TTSatoshi-Bold.otf */, + 7A6230C034DE4586AD564C7F /* TTSatoshi-DemiBold.otf */, + EAD24AA6025640BB9F7C7B6B /* TTSatoshi-Medium.otf */, + E70CFF92AAAE4DEF96F4931E /* TTSatoshi-Regular.otf */, ); name = Resources; sourceTree = ""; @@ -268,6 +276,10 @@ AE19C8EA249F4BC29A82736A /* TTSatoshi-DemiBold.otf in Resources */, 5EA58567F7C34D4BB4135E94 /* TTSatoshi-Medium.otf in Resources */, B4528AB09CC346C49EB6347E /* TTSatoshi-Regular.otf in Resources */, + 7F5F35C7F5874548A3B53457 /* TTSatoshi-Bold.otf in Resources */, + 295C649096E84360A861704B /* TTSatoshi-DemiBold.otf in Resources */, + 0EE2ADD303944494A5030793 /* TTSatoshi-Medium.otf in Resources */, + 5C232FC7C0094224A35E1882 /* TTSatoshi-Regular.otf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/packages/suite-native/ios/TrezorSuite.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/suite-native/app/ios/TrezorSuite.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from packages/suite-native/ios/TrezorSuite.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to suite-native/app/ios/TrezorSuite.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/packages/suite-native/ios/TrezorSuite.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/suite-native/app/ios/TrezorSuite.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from packages/suite-native/ios/TrezorSuite.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to suite-native/app/ios/TrezorSuite.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/packages/suite-native/ios/TrezorSuite.xcodeproj/xcshareddata/xcschemes/TrezorSuite.xcscheme b/suite-native/app/ios/TrezorSuite.xcodeproj/xcshareddata/xcschemes/TrezorSuite.xcscheme similarity index 100% rename from packages/suite-native/ios/TrezorSuite.xcodeproj/xcshareddata/xcschemes/TrezorSuite.xcscheme rename to suite-native/app/ios/TrezorSuite.xcodeproj/xcshareddata/xcschemes/TrezorSuite.xcscheme diff --git a/packages/suite-native/ios/TrezorSuite.xcworkspace/contents.xcworkspacedata b/suite-native/app/ios/TrezorSuite.xcworkspace/contents.xcworkspacedata similarity index 100% rename from packages/suite-native/ios/TrezorSuite.xcworkspace/contents.xcworkspacedata rename to suite-native/app/ios/TrezorSuite.xcworkspace/contents.xcworkspacedata diff --git a/packages/suite-native/ios/TrezorSuite.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/suite-native/app/ios/TrezorSuite.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from packages/suite-native/ios/TrezorSuite.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to suite-native/app/ios/TrezorSuite.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/packages/suite-native/ios/TrezorSuite/AppDelegate.h b/suite-native/app/ios/TrezorSuite/AppDelegate.h similarity index 100% rename from packages/suite-native/ios/TrezorSuite/AppDelegate.h rename to suite-native/app/ios/TrezorSuite/AppDelegate.h diff --git a/packages/suite-native/ios/TrezorSuite/AppDelegate.mm b/suite-native/app/ios/TrezorSuite/AppDelegate.mm similarity index 98% rename from packages/suite-native/ios/TrezorSuite/AppDelegate.mm rename to suite-native/app/ios/TrezorSuite/AppDelegate.mm index 364ec53a295..bfb31a175cf 100644 --- a/packages/suite-native/ios/TrezorSuite/AppDelegate.mm +++ b/suite-native/app/ios/TrezorSuite/AppDelegate.mm @@ -60,7 +60,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( - (NSURL *)sourceURLForBridge:(RCTBridge *)bridge { #if DEBUG - return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"packages/suite-native/index"]; + return [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"suite-native/app/index"]; #else return [[NSBundle mainBundle] URLForResource:@"main" withExtension:@"jsbundle"]; #endif diff --git a/packages/suite-native/ios/TrezorSuite/Images.xcassets/AppIcon.appiconset/Contents.json b/suite-native/app/ios/TrezorSuite/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from packages/suite-native/ios/TrezorSuite/Images.xcassets/AppIcon.appiconset/Contents.json rename to suite-native/app/ios/TrezorSuite/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/packages/suite-native/ios/TrezorSuite/Images.xcassets/Contents.json b/suite-native/app/ios/TrezorSuite/Images.xcassets/Contents.json similarity index 100% rename from packages/suite-native/ios/TrezorSuite/Images.xcassets/Contents.json rename to suite-native/app/ios/TrezorSuite/Images.xcassets/Contents.json diff --git a/packages/suite-native/ios/TrezorSuite/Info.plist b/suite-native/app/ios/TrezorSuite/Info.plist similarity index 98% rename from packages/suite-native/ios/TrezorSuite/Info.plist rename to suite-native/app/ios/TrezorSuite/Info.plist index f6c97a3774a..c35743be274 100644 --- a/packages/suite-native/ios/TrezorSuite/Info.plist +++ b/suite-native/app/ios/TrezorSuite/Info.plist @@ -36,7 +36,7 @@ NSLocationWhenInUseUsageDescription - + UIAppFonts TTSatoshi-Bold.otf diff --git a/packages/suite-native/ios/TrezorSuite/LaunchScreen.storyboard b/suite-native/app/ios/TrezorSuite/LaunchScreen.storyboard similarity index 100% rename from packages/suite-native/ios/TrezorSuite/LaunchScreen.storyboard rename to suite-native/app/ios/TrezorSuite/LaunchScreen.storyboard diff --git a/packages/suite-native/ios/TrezorSuite/main.m b/suite-native/app/ios/TrezorSuite/main.m similarity index 100% rename from packages/suite-native/ios/TrezorSuite/main.m rename to suite-native/app/ios/TrezorSuite/main.m diff --git a/packages/suite-native/ios/TrezorSuiteTests/Info.plist b/suite-native/app/ios/TrezorSuiteTests/Info.plist similarity index 100% rename from packages/suite-native/ios/TrezorSuiteTests/Info.plist rename to suite-native/app/ios/TrezorSuiteTests/Info.plist diff --git a/packages/suite-native/ios/TrezorSuiteTests/TrezorSuiteTests.m b/suite-native/app/ios/TrezorSuiteTests/TrezorSuiteTests.m similarity index 100% rename from packages/suite-native/ios/TrezorSuiteTests/TrezorSuiteTests.m rename to suite-native/app/ios/TrezorSuiteTests/TrezorSuiteTests.m diff --git a/packages/suite-native/ios/fastlane/Fastfile b/suite-native/app/ios/fastlane/Fastfile similarity index 100% rename from packages/suite-native/ios/fastlane/Fastfile rename to suite-native/app/ios/fastlane/Fastfile diff --git a/packages/suite-native/metro.config.js b/suite-native/app/metro.config.js similarity index 100% rename from packages/suite-native/metro.config.js rename to suite-native/app/metro.config.js diff --git a/packages/suite-native/package.json b/suite-native/app/package.json similarity index 100% rename from packages/suite-native/package.json rename to suite-native/app/package.json diff --git a/packages/suite-native/react-native.config.js b/suite-native/app/react-native.config.js similarity index 64% rename from packages/suite-native/react-native.config.js rename to suite-native/app/react-native.config.js index 8a1f4a359fb..0515e7587c5 100644 --- a/packages/suite-native/react-native.config.js +++ b/suite-native/app/react-native.config.js @@ -3,5 +3,5 @@ module.exports = { ios: {}, android: {}, }, - assets: ['../theme/fonts/'], + assets: ['../../packages/theme/fonts/'], }; diff --git a/packages/suite-native/src/App.tsx b/suite-native/app/src/App.tsx similarity index 100% rename from packages/suite-native/src/App.tsx rename to suite-native/app/src/App.tsx diff --git a/packages/suite-native/src/__tests__/App-test.tsx b/suite-native/app/src/__tests__/App-test.tsx similarity index 100% rename from packages/suite-native/src/__tests__/App-test.tsx rename to suite-native/app/src/__tests__/App-test.tsx diff --git a/suite-native/app/tsconfig.json b/suite-native/app/tsconfig.json new file mode 100644 index 00000000000..fa948a2e07f --- /dev/null +++ b/suite-native/app/tsconfig.json @@ -0,0 +1,15 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { "outDir": "libDev" }, + "references": [ + { "path": "../atoms" }, + { "path": "../navigation-root" }, + { "path": "../../packages/connect" }, + { "path": "../../packages/styles" }, + { "path": "../../packages/theme" }, + { + "path": "../../packages/transport-native" + } + ], + "include": [".", "**.json"] +} diff --git a/packages/suite-native-atoms/README.md b/suite-native/atoms/README.md similarity index 100% rename from packages/suite-native-atoms/README.md rename to suite-native/atoms/README.md diff --git a/packages/suite-native-atoms/jest.config.js b/suite-native/atoms/jest.config.js similarity index 100% rename from packages/suite-native-atoms/jest.config.js rename to suite-native/atoms/jest.config.js diff --git a/packages/suite-native-atoms/package.json b/suite-native/atoms/package.json similarity index 100% rename from packages/suite-native-atoms/package.json rename to suite-native/atoms/package.json diff --git a/packages/suite-native-atoms/src/Box.tsx b/suite-native/atoms/src/Box.tsx similarity index 100% rename from packages/suite-native-atoms/src/Box.tsx rename to suite-native/atoms/src/Box.tsx diff --git a/packages/suite-native-atoms/src/Button/Button.tsx b/suite-native/atoms/src/Button/Button.tsx similarity index 100% rename from packages/suite-native-atoms/src/Button/Button.tsx rename to suite-native/atoms/src/Button/Button.tsx diff --git a/packages/suite-native-atoms/src/Button/IconButton.tsx b/suite-native/atoms/src/Button/IconButton.tsx similarity index 100% rename from packages/suite-native-atoms/src/Button/IconButton.tsx rename to suite-native/atoms/src/Button/IconButton.tsx diff --git a/packages/suite-native-atoms/src/Button/TileButton.tsx b/suite-native/atoms/src/Button/TileButton.tsx similarity index 100% rename from packages/suite-native-atoms/src/Button/TileButton.tsx rename to suite-native/atoms/src/Button/TileButton.tsx diff --git a/packages/suite-native-atoms/src/CheckBox.tsx b/suite-native/atoms/src/CheckBox.tsx similarity index 100% rename from packages/suite-native-atoms/src/CheckBox.tsx rename to suite-native/atoms/src/CheckBox.tsx diff --git a/packages/suite-native-atoms/src/Chip.tsx b/suite-native/atoms/src/Chip.tsx similarity index 100% rename from packages/suite-native-atoms/src/Chip.tsx rename to suite-native/atoms/src/Chip.tsx diff --git a/packages/suite-native-atoms/src/Hint.tsx b/suite-native/atoms/src/Hint.tsx similarity index 100% rename from packages/suite-native-atoms/src/Hint.tsx rename to suite-native/atoms/src/Hint.tsx diff --git a/packages/suite-native-atoms/src/Input/Input.tsx b/suite-native/atoms/src/Input/Input.tsx similarity index 100% rename from packages/suite-native-atoms/src/Input/Input.tsx rename to suite-native/atoms/src/Input/Input.tsx diff --git a/packages/suite-native-atoms/src/Input/InputWrapper.tsx b/suite-native/atoms/src/Input/InputWrapper.tsx similarity index 100% rename from packages/suite-native-atoms/src/Input/InputWrapper.tsx rename to suite-native/atoms/src/Input/InputWrapper.tsx diff --git a/packages/suite-native-atoms/src/Input/SearchInput.tsx b/suite-native/atoms/src/Input/SearchInput.tsx similarity index 100% rename from packages/suite-native-atoms/src/Input/SearchInput.tsx rename to suite-native/atoms/src/Input/SearchInput.tsx diff --git a/packages/suite-native-atoms/src/ListItem/ListItem.tsx b/suite-native/atoms/src/ListItem/ListItem.tsx similarity index 100% rename from packages/suite-native-atoms/src/ListItem/ListItem.tsx rename to suite-native/atoms/src/ListItem/ListItem.tsx diff --git a/packages/suite-native-atoms/src/ListItem/ListItemIcon.tsx b/suite-native/atoms/src/ListItem/ListItemIcon.tsx similarity index 100% rename from packages/suite-native-atoms/src/ListItem/ListItemIcon.tsx rename to suite-native/atoms/src/ListItem/ListItemIcon.tsx diff --git a/packages/suite-native-atoms/src/ListItem/ListItemText.tsx b/suite-native/atoms/src/ListItem/ListItemText.tsx similarity index 100% rename from packages/suite-native-atoms/src/ListItem/ListItemText.tsx rename to suite-native/atoms/src/ListItem/ListItemText.tsx diff --git a/packages/suite-native-atoms/src/ListItem/SelectableListItem.tsx b/suite-native/atoms/src/ListItem/SelectableListItem.tsx similarity index 100% rename from packages/suite-native-atoms/src/ListItem/SelectableListItem.tsx rename to suite-native/atoms/src/ListItem/SelectableListItem.tsx diff --git a/packages/suite-native-atoms/src/ListItem/listItemTypes.ts b/suite-native/atoms/src/ListItem/listItemTypes.ts similarity index 100% rename from packages/suite-native-atoms/src/ListItem/listItemTypes.ts rename to suite-native/atoms/src/ListItem/listItemTypes.ts diff --git a/packages/suite-native-atoms/src/Modal/BottomModal.tsx b/suite-native/atoms/src/Modal/BottomModal.tsx similarity index 100% rename from packages/suite-native-atoms/src/Modal/BottomModal.tsx rename to suite-native/atoms/src/Modal/BottomModal.tsx diff --git a/packages/suite-native-atoms/src/Modal/BottomModalContainer.tsx b/suite-native/atoms/src/Modal/BottomModalContainer.tsx similarity index 100% rename from packages/suite-native-atoms/src/Modal/BottomModalContainer.tsx rename to suite-native/atoms/src/Modal/BottomModalContainer.tsx diff --git a/packages/suite-native-atoms/src/NumPadButton.tsx b/suite-native/atoms/src/NumPadButton.tsx similarity index 100% rename from packages/suite-native-atoms/src/NumPadButton.tsx rename to suite-native/atoms/src/NumPadButton.tsx diff --git a/packages/suite-native-atoms/src/Radio.tsx b/suite-native/atoms/src/Radio.tsx similarity index 100% rename from packages/suite-native-atoms/src/Radio.tsx rename to suite-native/atoms/src/Radio.tsx diff --git a/packages/suite-native-atoms/src/Select/Select.tsx b/suite-native/atoms/src/Select/Select.tsx similarity index 100% rename from packages/suite-native-atoms/src/Select/Select.tsx rename to suite-native/atoms/src/Select/Select.tsx diff --git a/packages/suite-native-atoms/src/Select/SelectItem.tsx b/suite-native/atoms/src/Select/SelectItem.tsx similarity index 100% rename from packages/suite-native-atoms/src/Select/SelectItem.tsx rename to suite-native/atoms/src/Select/SelectItem.tsx diff --git a/packages/suite-native-atoms/src/Select/SelectTrigger.tsx b/suite-native/atoms/src/Select/SelectTrigger.tsx similarity index 100% rename from packages/suite-native-atoms/src/Select/SelectTrigger.tsx rename to suite-native/atoms/src/Select/SelectTrigger.tsx diff --git a/packages/suite-native-atoms/src/Switch.tsx b/suite-native/atoms/src/Switch.tsx similarity index 100% rename from packages/suite-native-atoms/src/Switch.tsx rename to suite-native/atoms/src/Switch.tsx diff --git a/packages/suite-native-atoms/src/Text.tsx b/suite-native/atoms/src/Text.tsx similarity index 100% rename from packages/suite-native-atoms/src/Text.tsx rename to suite-native/atoms/src/Text.tsx diff --git a/packages/suite-native-atoms/src/TipToast.tsx b/suite-native/atoms/src/TipToast.tsx similarity index 100% rename from packages/suite-native-atoms/src/TipToast.tsx rename to suite-native/atoms/src/TipToast.tsx diff --git a/packages/suite-native-atoms/src/VStack.tsx b/suite-native/atoms/src/VStack.tsx similarity index 100% rename from packages/suite-native-atoms/src/VStack.tsx rename to suite-native/atoms/src/VStack.tsx diff --git a/packages/suite-native-atoms/src/index.ts b/suite-native/atoms/src/index.ts similarity index 100% rename from packages/suite-native-atoms/src/index.ts rename to suite-native/atoms/src/index.ts diff --git a/suite-native/atoms/tsconfig.json b/suite-native/atoms/tsconfig.json new file mode 100644 index 00000000000..9fcb4b65ef8 --- /dev/null +++ b/suite-native/atoms/tsconfig.json @@ -0,0 +1,9 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { "outDir": "libDev" }, + "references": [ + { "path": "../../packages/icons" }, + { "path": "../../packages/styles" }, + { "path": "../../packages/theme" } + ] +} diff --git a/packages/suite-native-home/jest.config.js b/suite-native/module-home/jest.config.js similarity index 100% rename from packages/suite-native-home/jest.config.js rename to suite-native/module-home/jest.config.js diff --git a/packages/suite-native-home/package.json b/suite-native/module-home/package.json similarity index 100% rename from packages/suite-native-home/package.json rename to suite-native/module-home/package.json diff --git a/packages/suite-native-home/src/index.ts b/suite-native/module-home/src/index.ts similarity index 100% rename from packages/suite-native-home/src/index.ts rename to suite-native/module-home/src/index.ts diff --git a/packages/suite-native-home/src/navigation/HomeStackNavigator.tsx b/suite-native/module-home/src/navigation/HomeStackNavigator.tsx similarity index 100% rename from packages/suite-native-home/src/navigation/HomeStackNavigator.tsx rename to suite-native/module-home/src/navigation/HomeStackNavigator.tsx diff --git a/packages/suite-native-home/src/navigation/routes.ts b/suite-native/module-home/src/navigation/routes.ts similarity index 100% rename from packages/suite-native-home/src/navigation/routes.ts rename to suite-native/module-home/src/navigation/routes.ts diff --git a/packages/suite-native-home/src/screens/HomeDemoScreen.tsx b/suite-native/module-home/src/screens/HomeDemoScreen.tsx similarity index 100% rename from packages/suite-native-home/src/screens/HomeDemoScreen.tsx rename to suite-native/module-home/src/screens/HomeDemoScreen.tsx diff --git a/packages/suite-native-home/src/screens/HomeScreen.tsx b/suite-native/module-home/src/screens/HomeScreen.tsx similarity index 100% rename from packages/suite-native-home/src/screens/HomeScreen.tsx rename to suite-native/module-home/src/screens/HomeScreen.tsx diff --git a/packages/suite-native-atoms/tsconfig.json b/suite-native/module-home/tsconfig.json similarity index 50% rename from packages/suite-native-atoms/tsconfig.json rename to suite-native/module-home/tsconfig.json index e2ed464df7e..04fb0e0c863 100644 --- a/packages/suite-native-atoms/tsconfig.json +++ b/suite-native/module-home/tsconfig.json @@ -2,8 +2,8 @@ "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "libDev" }, "references": [ - { "path": "../icons" }, - { "path": "../styles" }, - { "path": "../theme" } + { "path": "../navigation" }, + { "path": "../atoms" }, + { "path": "../../packages/styles" } ] } diff --git a/packages/suite-native-navigation/jest.config.js b/suite-native/module-settings/jest.config.js similarity index 100% rename from packages/suite-native-navigation/jest.config.js rename to suite-native/module-settings/jest.config.js diff --git a/packages/suite-native-settings/package.json b/suite-native/module-settings/package.json similarity index 100% rename from packages/suite-native-settings/package.json rename to suite-native/module-settings/package.json diff --git a/packages/suite-native-settings/src/components/ApplicationSettings.tsx b/suite-native/module-settings/src/components/ApplicationSettings.tsx similarity index 100% rename from packages/suite-native-settings/src/components/ApplicationSettings.tsx rename to suite-native/module-settings/src/components/ApplicationSettings.tsx diff --git a/packages/suite-native-settings/src/components/CoinsSettings.tsx b/suite-native/module-settings/src/components/CoinsSettings.tsx similarity index 100% rename from packages/suite-native-settings/src/components/CoinsSettings.tsx rename to suite-native/module-settings/src/components/CoinsSettings.tsx diff --git a/packages/suite-native-settings/src/components/DeviceActionButtons.tsx b/suite-native/module-settings/src/components/DeviceActionButtons.tsx similarity index 100% rename from packages/suite-native-settings/src/components/DeviceActionButtons.tsx rename to suite-native/module-settings/src/components/DeviceActionButtons.tsx diff --git a/packages/suite-native-settings/src/components/DeviceSettings.tsx b/suite-native/module-settings/src/components/DeviceSettings.tsx similarity index 100% rename from packages/suite-native-settings/src/components/DeviceSettings.tsx rename to suite-native/module-settings/src/components/DeviceSettings.tsx diff --git a/packages/suite-native-settings/src/components/SettingsSection.tsx b/suite-native/module-settings/src/components/SettingsSection.tsx similarity index 100% rename from packages/suite-native-settings/src/components/SettingsSection.tsx rename to suite-native/module-settings/src/components/SettingsSection.tsx diff --git a/packages/suite-native-settings/src/components/SettingsSectionItem.tsx b/suite-native/module-settings/src/components/SettingsSectionItem.tsx similarity index 100% rename from packages/suite-native-settings/src/components/SettingsSectionItem.tsx rename to suite-native/module-settings/src/components/SettingsSectionItem.tsx diff --git a/packages/suite-native-settings/src/index.ts b/suite-native/module-settings/src/index.ts similarity index 100% rename from packages/suite-native-settings/src/index.ts rename to suite-native/module-settings/src/index.ts diff --git a/packages/suite-native-settings/src/navigation/SettingsStackNavigator.tsx b/suite-native/module-settings/src/navigation/SettingsStackNavigator.tsx similarity index 100% rename from packages/suite-native-settings/src/navigation/SettingsStackNavigator.tsx rename to suite-native/module-settings/src/navigation/SettingsStackNavigator.tsx diff --git a/packages/suite-native-settings/src/navigation/routes.ts b/suite-native/module-settings/src/navigation/routes.ts similarity index 100% rename from packages/suite-native-settings/src/navigation/routes.ts rename to suite-native/module-settings/src/navigation/routes.ts diff --git a/packages/suite-native-settings/src/screens/SettingsAdvancedScreen.tsx b/suite-native/module-settings/src/screens/SettingsAdvancedScreen.tsx similarity index 100% rename from packages/suite-native-settings/src/screens/SettingsAdvancedScreen.tsx rename to suite-native/module-settings/src/screens/SettingsAdvancedScreen.tsx diff --git a/packages/suite-native-settings/src/screens/SettingsLabelingScreen.tsx b/suite-native/module-settings/src/screens/SettingsLabelingScreen.tsx similarity index 100% rename from packages/suite-native-settings/src/screens/SettingsLabelingScreen.tsx rename to suite-native/module-settings/src/screens/SettingsLabelingScreen.tsx diff --git a/packages/suite-native-settings/src/screens/SettingsLocalisationScreen.tsx b/suite-native/module-settings/src/screens/SettingsLocalisationScreen.tsx similarity index 100% rename from packages/suite-native-settings/src/screens/SettingsLocalisationScreen.tsx rename to suite-native/module-settings/src/screens/SettingsLocalisationScreen.tsx diff --git a/packages/suite-native-settings/src/screens/SettingsScreen.tsx b/suite-native/module-settings/src/screens/SettingsScreen.tsx similarity index 100% rename from packages/suite-native-settings/src/screens/SettingsScreen.tsx rename to suite-native/module-settings/src/screens/SettingsScreen.tsx diff --git a/packages/suite-native-navigation/tsconfig.json b/suite-native/module-settings/tsconfig.json similarity index 50% rename from packages/suite-native-navigation/tsconfig.json rename to suite-native/module-settings/tsconfig.json index 6b3a3959ac4..04fb0e0c863 100644 --- a/packages/suite-native-navigation/tsconfig.json +++ b/suite-native/module-settings/tsconfig.json @@ -2,8 +2,8 @@ "extends": "../../tsconfig.json", "compilerOptions": { "outDir": "libDev" }, "references": [ - { "path": "../suite-native-atoms" }, - { "path": "../icons" }, - { "path": "../styles" } + { "path": "../navigation" }, + { "path": "../atoms" }, + { "path": "../../packages/styles" } ] } diff --git a/packages/suite-native-navigation-root/jest.config.js b/suite-native/navigation-root/jest.config.js similarity index 100% rename from packages/suite-native-navigation-root/jest.config.js rename to suite-native/navigation-root/jest.config.js diff --git a/packages/suite-native-navigation-root/package.json b/suite-native/navigation-root/package.json similarity index 100% rename from packages/suite-native-navigation-root/package.json rename to suite-native/navigation-root/package.json diff --git a/packages/suite-native-navigation-root/src/dummyScreens/AccountsScreen.tsx b/suite-native/navigation-root/src/dummyScreens/AccountsScreen.tsx similarity index 100% rename from packages/suite-native-navigation-root/src/dummyScreens/AccountsScreen.tsx rename to suite-native/navigation-root/src/dummyScreens/AccountsScreen.tsx diff --git a/packages/suite-native-navigation-root/src/dummyScreens/ActionScreen.tsx b/suite-native/navigation-root/src/dummyScreens/ActionScreen.tsx similarity index 100% rename from packages/suite-native-navigation-root/src/dummyScreens/ActionScreen.tsx rename to suite-native/navigation-root/src/dummyScreens/ActionScreen.tsx diff --git a/packages/suite-native-navigation-root/src/dummyScreens/PricesScreen.tsx b/suite-native/navigation-root/src/dummyScreens/PricesScreen.tsx similarity index 100% rename from packages/suite-native-navigation-root/src/dummyScreens/PricesScreen.tsx rename to suite-native/navigation-root/src/dummyScreens/PricesScreen.tsx diff --git a/packages/suite-native-navigation-root/src/index.ts b/suite-native/navigation-root/src/index.ts similarity index 100% rename from packages/suite-native-navigation-root/src/index.ts rename to suite-native/navigation-root/src/index.ts diff --git a/packages/suite-native-navigation-root/src/navigation/RootTabNavigator.tsx b/suite-native/navigation-root/src/navigation/RootTabNavigator.tsx similarity index 100% rename from packages/suite-native-navigation-root/src/navigation/RootTabNavigator.tsx rename to suite-native/navigation-root/src/navigation/RootTabNavigator.tsx diff --git a/packages/suite-native-navigation-root/src/navigation/navigationMap.d.ts b/suite-native/navigation-root/src/navigation/navigationMap.d.ts similarity index 100% rename from packages/suite-native-navigation-root/src/navigation/navigationMap.d.ts rename to suite-native/navigation-root/src/navigation/navigationMap.d.ts diff --git a/packages/suite-native-navigation-root/src/navigation/routes.ts b/suite-native/navigation-root/src/navigation/routes.ts similarity index 100% rename from packages/suite-native-navigation-root/src/navigation/routes.ts rename to suite-native/navigation-root/src/navigation/routes.ts diff --git a/suite-native/navigation-root/tsconfig.json b/suite-native/navigation-root/tsconfig.json new file mode 100644 index 00000000000..2849b91ac31 --- /dev/null +++ b/suite-native/navigation-root/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { "outDir": "libDev" }, + "references": [ + { "path": "../module-settings" }, + { "path": "../navigation" }, + { "path": "../atoms" }, + { "path": "../../packages/icons" }, + { "path": "../../packages/styles" } + ] +} diff --git a/packages/suite-native-settings/jest.config.js b/suite-native/navigation/jest.config.js similarity index 100% rename from packages/suite-native-settings/jest.config.js rename to suite-native/navigation/jest.config.js diff --git a/packages/suite-native-navigation/package.json b/suite-native/navigation/package.json similarity index 100% rename from packages/suite-native-navigation/package.json rename to suite-native/navigation/package.json diff --git a/packages/suite-native-navigation/src/components/Screen.tsx b/suite-native/navigation/src/components/Screen.tsx similarity index 100% rename from packages/suite-native-navigation/src/components/Screen.tsx rename to suite-native/navigation/src/components/Screen.tsx diff --git a/packages/suite-native-navigation/src/components/ScreenHeader.tsx b/suite-native/navigation/src/components/ScreenHeader.tsx similarity index 100% rename from packages/suite-native-navigation/src/components/ScreenHeader.tsx rename to suite-native/navigation/src/components/ScreenHeader.tsx diff --git a/packages/suite-native-navigation/src/components/TabBar.tsx b/suite-native/navigation/src/components/TabBar.tsx similarity index 100% rename from packages/suite-native-navigation/src/components/TabBar.tsx rename to suite-native/navigation/src/components/TabBar.tsx diff --git a/packages/suite-native-navigation/src/components/TabBarItem.tsx b/suite-native/navigation/src/components/TabBarItem.tsx similarity index 100% rename from packages/suite-native-navigation/src/components/TabBarItem.tsx rename to suite-native/navigation/src/components/TabBarItem.tsx diff --git a/packages/suite-native-navigation/src/config.ts b/suite-native/navigation/src/config.ts similarity index 100% rename from packages/suite-native-navigation/src/config.ts rename to suite-native/navigation/src/config.ts diff --git a/packages/suite-native-navigation/src/index.ts b/suite-native/navigation/src/index.ts similarity index 100% rename from packages/suite-native-navigation/src/index.ts rename to suite-native/navigation/src/index.ts diff --git a/packages/suite-native-navigation/src/types.tsx b/suite-native/navigation/src/types.tsx similarity index 100% rename from packages/suite-native-navigation/src/types.tsx rename to suite-native/navigation/src/types.tsx diff --git a/suite-native/navigation/tsconfig.json b/suite-native/navigation/tsconfig.json new file mode 100644 index 00000000000..c70ec3cd557 --- /dev/null +++ b/suite-native/navigation/tsconfig.json @@ -0,0 +1,9 @@ +{ + "extends": "../../tsconfig.json", + "compilerOptions": { "outDir": "libDev" }, + "references": [ + { "path": "../atoms" }, + { "path": "../../packages/icons" }, + { "path": "../../packages/styles" } + ] +}