chore: separate suite native to its own packges folder (#5685)

trezor · Jun 26, 2022 · 1cd4f5d · 1cd4f5d
1 parent c0eeb4a
commit 1cd4f5d
Show file tree

Hide file tree

Showing 223 changed files with 91 additions and 79 deletions.
diff --git 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
+.git
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/packages/suite-native-navigation-root/tsconfig.json b/packages/suite-native-navigation-root/tsconfig.json
diff --git a/packages/suite-native-settings/tsconfig.json b/packages/suite-native-settings/tsconfig.json
diff --git a/packages/suite-native/tsconfig.json b/packages/suite-native/tsconfig.json
diff --git a/packages/suite-native/.buckconfig → suite-native/app/.buckconfig b/packages/suite-native/.buckconfig → suite-native/app/.buckconfig
diff --git a/packages/suite-native/.eslintrc.js → suite-native/app/.eslintrc.js b/packages/suite-native/.eslintrc.js → suite-native/app/.eslintrc.js
diff --git a/packages/suite-native/.gitignore → suite-native/app/.gitignore b/packages/suite-native/.gitignore → suite-native/app/.gitignore
diff --git a/packages/suite-native/.watchmanconfig → suite-native/app/.watchmanconfig b/packages/suite-native/.watchmanconfig → suite-native/app/.watchmanconfig
diff --git a/packages/suite-native/Gemfile → suite-native/app/Gemfile b/packages/suite-native/Gemfile → suite-native/app/Gemfile
diff --git a/packages/suite-native/Gemfile.lock → suite-native/app/Gemfile.lock b/packages/suite-native/Gemfile.lock → suite-native/app/Gemfile.lock
diff --git a/packages/suite-native/README.md → suite-native/app/README.md b/packages/suite-native/README.md → suite-native/app/README.md
diff --git a/packages/suite-native/_bundle/config → suite-native/app/_bundle/config b/packages/suite-native/_bundle/config → suite-native/app/_bundle/config
diff --git a/packages/suite-native/_ruby-version → suite-native/app/_ruby-version b/packages/suite-native/_ruby-version → suite-native/app/_ruby-version
diff --git a/packages/suite-native/android/app/_BUCK → suite-native/app/android/app/_BUCK b/packages/suite-native/android/app/_BUCK → suite-native/app/android/app/_BUCK
diff --git a/...ges/suite-native/android/app/build.gradle → suite-native/app/android/app/build.gradle b/...ges/suite-native/android/app/build.gradle → 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/...s/suite-native/android/app/build_defs.bzl → suite-native/app/android/app/build_defs.bzl b/...s/suite-native/android/app/build_defs.bzl → suite-native/app/android/app/build_defs.bzl
diff --git a/...s/suite-native/android/app/debug.keystore → suite-native/app/android/app/debug.keystore b/...s/suite-native/android/app/debug.keystore → suite-native/app/android/app/debug.keystore
diff --git a/...ite-native/android/app/proguard-rules.pro → ...native/app/android/app/proguard-rules.pro b/...ite-native/android/app/proguard-rules.pro → ...native/app/android/app/proguard-rules.pro
diff --git a/...android/app/src/debug/AndroidManifest.xml → ...android/app/src/debug/AndroidManifest.xml b/...android/app/src/debug/AndroidManifest.xml → ...android/app/src/debug/AndroidManifest.xml
diff --git a/...a/io/trezor/suite/ReactNativeFlipper.java → ...a/io/trezor/suite/ReactNativeFlipper.java b/...a/io/trezor/suite/ReactNativeFlipper.java → ...a/io/trezor/suite/ReactNativeFlipper.java
diff --git a/...v/res/drawable/ic_launcher_foreground.xml → ...v/res/drawable/ic_launcher_foreground.xml b/...v/res/drawable/ic_launcher_foreground.xml → ...v/res/drawable/ic_launcher_foreground.xml
diff --git a/...dev/res/mipmap-anydpi-v26/ic_launcher.xml → ...dev/res/mipmap-anydpi-v26/ic_launcher.xml b/...dev/res/mipmap-anydpi-v26/ic_launcher.xml → ...dev/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/...s/mipmap-anydpi-v26/ic_launcher_round.xml → ...s/mipmap-anydpi-v26/ic_launcher_round.xml b/...s/mipmap-anydpi-v26/ic_launcher_round.xml → ...s/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/...p/src/dev/res/mipmap-hdpi/ic_launcher.png → ...p/src/dev/res/mipmap-hdpi/ic_launcher.png b/...p/src/dev/res/mipmap-hdpi/ic_launcher.png → ...p/src/dev/res/mipmap-hdpi/ic_launcher.png
diff --git a/...dev/res/mipmap-hdpi/ic_launcher_round.png → ...dev/res/mipmap-hdpi/ic_launcher_round.png b/...dev/res/mipmap-hdpi/ic_launcher_round.png → ...dev/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/...p/src/dev/res/mipmap-mdpi/ic_launcher.png → ...p/src/dev/res/mipmap-mdpi/ic_launcher.png b/...p/src/dev/res/mipmap-mdpi/ic_launcher.png → ...p/src/dev/res/mipmap-mdpi/ic_launcher.png
diff --git a/...dev/res/mipmap-mdpi/ic_launcher_round.png → ...dev/res/mipmap-mdpi/ic_launcher_round.png b/...dev/res/mipmap-mdpi/ic_launcher_round.png → ...dev/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/.../src/dev/res/mipmap-xhdpi/ic_launcher.png → .../src/dev/res/mipmap-xhdpi/ic_launcher.png b/.../src/dev/res/mipmap-xhdpi/ic_launcher.png → .../src/dev/res/mipmap-xhdpi/ic_launcher.png
diff --git a/...ev/res/mipmap-xhdpi/ic_launcher_round.png → ...ev/res/mipmap-xhdpi/ic_launcher_round.png b/...ev/res/mipmap-xhdpi/ic_launcher_round.png → ...ev/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/...src/dev/res/mipmap-xxhdpi/ic_launcher.png → ...src/dev/res/mipmap-xxhdpi/ic_launcher.png b/...src/dev/res/mipmap-xxhdpi/ic_launcher.png → ...src/dev/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/...v/res/mipmap-xxhdpi/ic_launcher_round.png → ...v/res/mipmap-xxhdpi/ic_launcher_round.png b/...v/res/mipmap-xxhdpi/ic_launcher_round.png → ...v/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/...rc/dev/res/mipmap-xxxhdpi/ic_launcher.png → ...rc/dev/res/mipmap-xxxhdpi/ic_launcher.png b/...rc/dev/res/mipmap-xxxhdpi/ic_launcher.png → ...rc/dev/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/.../res/mipmap-xxxhdpi/ic_launcher_round.png → .../res/mipmap-xxxhdpi/ic_launcher_round.png b/.../res/mipmap-xxxhdpi/ic_launcher_round.png → .../res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/...ndroid/app/src/dev/res/values/strings.xml → ...ndroid/app/src/dev/res/values/strings.xml b/...ndroid/app/src/dev/res/values/strings.xml → ...ndroid/app/src/dev/res/values/strings.xml
diff --git a/.../src/firebaseDevelop/google-services.json → .../src/firebaseDevelop/google-services.json b/.../src/firebaseDevelop/google-services.json → .../src/firebaseDevelop/google-services.json
diff --git a/...p/res/drawable/ic_launcher_foreground.xml → ...p/res/drawable/ic_launcher_foreground.xml b/...p/res/drawable/ic_launcher_foreground.xml → ...p/res/drawable/ic_launcher_foreground.xml
diff --git a/...lop/res/mipmap-anydpi-v26/ic_launcher.xml → ...lop/res/mipmap-anydpi-v26/ic_launcher.xml b/...lop/res/mipmap-anydpi-v26/ic_launcher.xml → ...lop/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/...s/mipmap-anydpi-v26/ic_launcher_round.xml → ...s/mipmap-anydpi-v26/ic_launcher_round.xml b/...s/mipmap-anydpi-v26/ic_launcher_round.xml → ...s/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/...seDevelop/res/mipmap-hdpi/ic_launcher.png → ...seDevelop/res/mipmap-hdpi/ic_launcher.png b/...seDevelop/res/mipmap-hdpi/ic_launcher.png → ...seDevelop/res/mipmap-hdpi/ic_launcher.png
diff --git a/...lop/res/mipmap-hdpi/ic_launcher_round.png → ...lop/res/mipmap-hdpi/ic_launcher_round.png b/...lop/res/mipmap-hdpi/ic_launcher_round.png → ...lop/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/...seDevelop/res/mipmap-mdpi/ic_launcher.png → ...seDevelop/res/mipmap-mdpi/ic_launcher.png b/...seDevelop/res/mipmap-mdpi/ic_launcher.png → ...seDevelop/res/mipmap-mdpi/ic_launcher.png
diff --git a/...lop/res/mipmap-mdpi/ic_launcher_round.png → ...lop/res/mipmap-mdpi/ic_launcher_round.png b/...lop/res/mipmap-mdpi/ic_launcher_round.png → ...lop/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/...eDevelop/res/mipmap-xhdpi/ic_launcher.png → ...eDevelop/res/mipmap-xhdpi/ic_launcher.png b/...eDevelop/res/mipmap-xhdpi/ic_launcher.png → ...eDevelop/res/mipmap-xhdpi/ic_launcher.png
diff --git a/...op/res/mipmap-xhdpi/ic_launcher_round.png → ...op/res/mipmap-xhdpi/ic_launcher_round.png b/...op/res/mipmap-xhdpi/ic_launcher_round.png → ...op/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/...Develop/res/mipmap-xxhdpi/ic_launcher.png → ...Develop/res/mipmap-xxhdpi/ic_launcher.png b/...Develop/res/mipmap-xxhdpi/ic_launcher.png → ...Develop/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/...p/res/mipmap-xxhdpi/ic_launcher_round.png → ...p/res/mipmap-xxhdpi/ic_launcher_round.png b/...p/res/mipmap-xxhdpi/ic_launcher_round.png → ...p/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/...evelop/res/mipmap-xxxhdpi/ic_launcher.png → ...evelop/res/mipmap-xxxhdpi/ic_launcher.png b/...evelop/res/mipmap-xxxhdpi/ic_launcher.png → ...evelop/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/.../res/mipmap-xxxhdpi/ic_launcher_round.png → .../res/mipmap-xxxhdpi/ic_launcher_round.png b/.../res/mipmap-xxxhdpi/ic_launcher_round.png → .../res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/...rc/firebaseDevelop/res/values/strings.xml → ...rc/firebaseDevelop/res/values/strings.xml b/...rc/firebaseDevelop/res/values/strings.xml → ...rc/firebaseDevelop/res/values/strings.xml
diff --git a/...g/res/drawable/ic_launcher_foreground.xml → ...g/res/drawable/ic_launcher_foreground.xml b/...g/res/drawable/ic_launcher_foreground.xml → ...g/res/drawable/ic_launcher_foreground.xml
diff --git a/...ing/res/mipmap-anydpi-v26/ic_launcher.xml → ...ing/res/mipmap-anydpi-v26/ic_launcher.xml b/...ing/res/mipmap-anydpi-v26/ic_launcher.xml → ...ing/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/...s/mipmap-anydpi-v26/ic_launcher_round.xml → ...s/mipmap-anydpi-v26/ic_launcher_round.xml b/...s/mipmap-anydpi-v26/ic_launcher_round.xml → ...s/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/...seStaging/res/mipmap-hdpi/ic_launcher.png → ...seStaging/res/mipmap-hdpi/ic_launcher.png b/...seStaging/res/mipmap-hdpi/ic_launcher.png → ...seStaging/res/mipmap-hdpi/ic_launcher.png
diff --git a/...ing/res/mipmap-hdpi/ic_launcher_round.png → ...ing/res/mipmap-hdpi/ic_launcher_round.png b/...ing/res/mipmap-hdpi/ic_launcher_round.png → ...ing/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/...seStaging/res/mipmap-mdpi/ic_launcher.png → ...seStaging/res/mipmap-mdpi/ic_launcher.png b/...seStaging/res/mipmap-mdpi/ic_launcher.png → ...seStaging/res/mipmap-mdpi/ic_launcher.png
diff --git a/...ing/res/mipmap-mdpi/ic_launcher_round.png → ...ing/res/mipmap-mdpi/ic_launcher_round.png b/...ing/res/mipmap-mdpi/ic_launcher_round.png → ...ing/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/...eStaging/res/mipmap-xhdpi/ic_launcher.png → ...eStaging/res/mipmap-xhdpi/ic_launcher.png b/...eStaging/res/mipmap-xhdpi/ic_launcher.png → ...eStaging/res/mipmap-xhdpi/ic_launcher.png
diff --git a/...ng/res/mipmap-xhdpi/ic_launcher_round.png → ...ng/res/mipmap-xhdpi/ic_launcher_round.png b/...ng/res/mipmap-xhdpi/ic_launcher_round.png → ...ng/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/...Staging/res/mipmap-xxhdpi/ic_launcher.png → ...Staging/res/mipmap-xxhdpi/ic_launcher.png b/...Staging/res/mipmap-xxhdpi/ic_launcher.png → ...Staging/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/...g/res/mipmap-xxhdpi/ic_launcher_round.png → ...g/res/mipmap-xxhdpi/ic_launcher_round.png b/...g/res/mipmap-xxhdpi/ic_launcher_round.png → ...g/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/...taging/res/mipmap-xxxhdpi/ic_launcher.png → ...taging/res/mipmap-xxxhdpi/ic_launcher.png b/...taging/res/mipmap-xxxhdpi/ic_launcher.png → ...taging/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/.../res/mipmap-xxxhdpi/ic_launcher_round.png → .../res/mipmap-xxxhdpi/ic_launcher_round.png b/.../res/mipmap-xxxhdpi/ic_launcher_round.png → .../res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/...rc/firebaseStaging/res/values/strings.xml → ...rc/firebaseStaging/res/values/strings.xml b/...rc/firebaseStaging/res/values/strings.xml → ...rc/firebaseStaging/res/values/strings.xml
diff --git a/.../android/app/src/main/AndroidManifest.xml → .../android/app/src/main/AndroidManifest.xml b/.../android/app/src/main/AndroidManifest.xml → .../android/app/src/main/AndroidManifest.xml
diff --git a/.../src/main/assets/fonts/TTSatoshi-Bold.otf → .../src/main/assets/fonts/TTSatoshi-Bold.otf b/.../src/main/assets/fonts/TTSatoshi-Bold.otf → .../src/main/assets/fonts/TTSatoshi-Bold.otf
diff --git a/.../main/assets/fonts/TTSatoshi-DemiBold.otf → .../main/assets/fonts/TTSatoshi-DemiBold.otf b/.../main/assets/fonts/TTSatoshi-DemiBold.otf → .../main/assets/fonts/TTSatoshi-DemiBold.otf
diff --git a/...rc/main/assets/fonts/TTSatoshi-Medium.otf → ...rc/main/assets/fonts/TTSatoshi-Medium.otf b/...rc/main/assets/fonts/TTSatoshi-Medium.otf → ...rc/main/assets/fonts/TTSatoshi-Medium.otf
diff --git a/...c/main/assets/fonts/TTSatoshi-Regular.otf → ...c/main/assets/fonts/TTSatoshi-Regular.otf b/...c/main/assets/fonts/TTSatoshi-Regular.otf → ...c/main/assets/fonts/TTSatoshi-Regular.otf
diff --git a/...in/java/io/trezor/suite/MainActivity.java → ...in/java/io/trezor/suite/MainActivity.java b/...in/java/io/trezor/suite/MainActivity.java → ...in/java/io/trezor/suite/MainActivity.java
diff --git a/...java/io/trezor/suite/MainApplication.java → ...java/io/trezor/suite/MainApplication.java b/...java/io/trezor/suite/MainApplication.java → ...java/io/trezor/suite/MainApplication.java
@@ -33,7 +33,7 @@ protected List<ReactPackage> getPackages() {
 
         @Override
         protected String getJSMainModuleName() {
-          return "packages/suite-native/index";
+          return "suite-native/app/index";
         }
       };
 

diff --git a/...cture/MainApplicationReactNativeHost.java → ...cture/MainApplicationReactNativeHost.java b/...cture/MainApplicationReactNativeHost.java → ...cture/MainApplicationReactNativeHost.java
@@ -56,7 +56,7 @@ protected List<ReactPackage> getPackages() {
 
   @Override
   protected String getJSMainModuleName() {
-    return "packages/suite-native/index";
+    return "suite-native/app/index";
   }
 
   @NonNull

diff --git a/...re/components/MainComponentsRegistry.java → ...re/components/MainComponentsRegistry.java b/...re/components/MainComponentsRegistry.java → ...re/components/MainComponentsRegistry.java
diff --git a/...pplicationTurboModuleManagerDelegate.java → ...pplicationTurboModuleManagerDelegate.java b/...pplicationTurboModuleManagerDelegate.java → ...pplicationTurboModuleManagerDelegate.java
diff --git a/...ative/android/app/src/main/jni/Android.mk → ...e/app/android/app/src/main/jni/Android.mk b/...ative/android/app/src/main/jni/Android.mk → ...e/app/android/app/src/main/jni/Android.mk
diff --git a/...ain/jni/MainApplicationModuleProvider.cpp → ...ain/jni/MainApplicationModuleProvider.cpp b/...ain/jni/MainApplicationModuleProvider.cpp → ...ain/jni/MainApplicationModuleProvider.cpp
diff --git a/.../main/jni/MainApplicationModuleProvider.h → .../main/jni/MainApplicationModuleProvider.h b/.../main/jni/MainApplicationModuleProvider.h → .../main/jni/MainApplicationModuleProvider.h
diff --git a/...ApplicationTurboModuleManagerDelegate.cpp → ...ApplicationTurboModuleManagerDelegate.cpp b/...ApplicationTurboModuleManagerDelegate.cpp → ...ApplicationTurboModuleManagerDelegate.cpp
diff --git a/...inApplicationTurboModuleManagerDelegate.h → ...inApplicationTurboModuleManagerDelegate.h b/...inApplicationTurboModuleManagerDelegate.h → ...inApplicationTurboModuleManagerDelegate.h
diff --git a/...p/src/main/jni/MainComponentsRegistry.cpp → ...p/src/main/jni/MainComponentsRegistry.cpp b/...p/src/main/jni/MainComponentsRegistry.cpp → ...p/src/main/jni/MainComponentsRegistry.cpp
diff --git a/...app/src/main/jni/MainComponentsRegistry.h → ...app/src/main/jni/MainComponentsRegistry.h b/...app/src/main/jni/MainComponentsRegistry.h → ...app/src/main/jni/MainComponentsRegistry.h
diff --git a/...ative/android/app/src/main/jni/OnLoad.cpp → ...e/app/android/app/src/main/jni/OnLoad.cpp b/...ative/android/app/src/main/jni/OnLoad.cpp → ...e/app/android/app/src/main/jni/OnLoad.cpp
diff --git a/...n/res/drawable/ic_launcher_foreground.xml → ...n/res/drawable/ic_launcher_foreground.xml b/...n/res/drawable/ic_launcher_foreground.xml → ...n/res/drawable/ic_launcher_foreground.xml
diff --git a/...in/res/drawable/rn_edit_text_material.xml → ...in/res/drawable/rn_edit_text_material.xml b/...in/res/drawable/rn_edit_text_material.xml → ...in/res/drawable/rn_edit_text_material.xml
diff --git a/...ain/res/mipmap-anydpi-v26/ic_launcher.xml → ...ain/res/mipmap-anydpi-v26/ic_launcher.xml b/...ain/res/mipmap-anydpi-v26/ic_launcher.xml → ...ain/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/...s/mipmap-anydpi-v26/ic_launcher_round.xml → ...s/mipmap-anydpi-v26/ic_launcher_round.xml b/...s/mipmap-anydpi-v26/ic_launcher_round.xml → ...s/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/.../src/main/res/mipmap-hdpi/ic_launcher.png → .../src/main/res/mipmap-hdpi/ic_launcher.png b/.../src/main/res/mipmap-hdpi/ic_launcher.png → .../src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/...ain/res/mipmap-hdpi/ic_launcher_round.png → ...ain/res/mipmap-hdpi/ic_launcher_round.png b/...ain/res/mipmap-hdpi/ic_launcher_round.png → ...ain/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/.../src/main/res/mipmap-mdpi/ic_launcher.png → .../src/main/res/mipmap-mdpi/ic_launcher.png b/.../src/main/res/mipmap-mdpi/ic_launcher.png → .../src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/...ain/res/mipmap-mdpi/ic_launcher_round.png → ...ain/res/mipmap-mdpi/ic_launcher_round.png b/...ain/res/mipmap-mdpi/ic_launcher_round.png → ...ain/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/...src/main/res/mipmap-xhdpi/ic_launcher.png → ...src/main/res/mipmap-xhdpi/ic_launcher.png b/...src/main/res/mipmap-xhdpi/ic_launcher.png → ...src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/...in/res/mipmap-xhdpi/ic_launcher_round.png → ...in/res/mipmap-xhdpi/ic_launcher_round.png b/...in/res/mipmap-xhdpi/ic_launcher_round.png → ...in/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/...rc/main/res/mipmap-xxhdpi/ic_launcher.png → ...rc/main/res/mipmap-xxhdpi/ic_launcher.png b/...rc/main/res/mipmap-xxhdpi/ic_launcher.png → ...rc/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/...n/res/mipmap-xxhdpi/ic_launcher_round.png → ...n/res/mipmap-xxhdpi/ic_launcher_round.png b/...n/res/mipmap-xxhdpi/ic_launcher_round.png → ...n/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/...c/main/res/mipmap-xxxhdpi/ic_launcher.png → ...c/main/res/mipmap-xxxhdpi/ic_launcher.png b/...c/main/res/mipmap-xxxhdpi/ic_launcher.png → ...c/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/.../res/mipmap-xxxhdpi/ic_launcher_round.png → .../res/mipmap-xxxhdpi/ic_launcher_round.png b/.../res/mipmap-xxxhdpi/ic_launcher_round.png → .../res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/...ain/res/values/ic_launcher_background.xml → ...ain/res/values/ic_launcher_background.xml b/...ain/res/values/ic_launcher_background.xml → ...ain/res/values/ic_launcher_background.xml
diff --git a/...droid/app/src/main/res/values/strings.xml → ...droid/app/src/main/res/values/strings.xml b/...droid/app/src/main/res/values/strings.xml → ...droid/app/src/main/res/values/strings.xml
diff --git a/...ndroid/app/src/main/res/values/styles.xml → ...ndroid/app/src/main/res/values/styles.xml b/...ndroid/app/src/main/res/values/styles.xml → ...ndroid/app/src/main/res/values/styles.xml
diff --git a/packages/suite-native/android/build.gradle → suite-native/app/android/build.gradle b/packages/suite-native/android/build.gradle → suite-native/app/android/build.gradle
diff --git a/...es/suite-native/android/fastlane/Fastfile → suite-native/app/android/fastlane/Fastfile b/...es/suite-native/android/fastlane/Fastfile → suite-native/app/android/fastlane/Fastfile
diff --git a/...es/suite-native/android/gradle.properties → suite-native/app/android/gradle.properties b/...es/suite-native/android/gradle.properties → suite-native/app/android/gradle.properties
diff --git a/...android/gradle/wrapper/gradle-wrapper.jar → ...android/gradle/wrapper/gradle-wrapper.jar b/...android/gradle/wrapper/gradle-wrapper.jar → ...android/gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/packages/suite-native/android/gradlew → suite-native/app/android/gradlew b/packages/suite-native/android/gradlew → suite-native/app/android/gradlew
diff --git a/packages/suite-native/android/gradlew.bat → suite-native/app/android/gradlew.bat b/packages/suite-native/android/gradlew.bat → suite-native/app/android/gradlew.bat
diff --git a/...ages/suite-native/android/settings.gradle → suite-native/app/android/settings.gradle b/...ages/suite-native/android/settings.gradle → suite-native/app/android/settings.gradle
diff --git a/packages/suite-native/app.json → suite-native/app/app.json b/packages/suite-native/app.json → suite-native/app/app.json
diff --git a/packages/suite-native/babel.config.js → suite-native/app/babel.config.js b/packages/suite-native/babel.config.js → suite-native/app/babel.config.js
diff --git a/packages/suite-native/fastlane/Appfile → suite-native/app/fastlane/Appfile b/packages/suite-native/fastlane/Appfile → suite-native/app/fastlane/Appfile
diff --git a/packages/suite-native/fastlane/Fastfile → suite-native/app/fastlane/Fastfile b/packages/suite-native/fastlane/Fastfile → suite-native/app/fastlane/Fastfile
diff --git a/packages/suite-native/fastlane/Pluginfile → suite-native/app/fastlane/Pluginfile b/packages/suite-native/fastlane/Pluginfile → suite-native/app/fastlane/Pluginfile
diff --git a/...s/suite-native/files/app_icon_512x512.svg → suite-native/app/files/app_icon_512x512.svg b/...s/suite-native/files/app_icon_512x512.svg → suite-native/app/files/app_icon_512x512.svg
diff --git a/...ite-native/files/app_icon_512x512_dev.svg → ...native/app/files/app_icon_512x512_dev.svg b/...ite-native/files/app_icon_512x512_dev.svg → ...native/app/files/app_icon_512x512_dev.svg
diff --git a/...e-native/files/app_icon_512x512_local.svg → ...tive/app/files/app_icon_512x512_local.svg b/...e-native/files/app_icon_512x512_local.svg → ...tive/app/files/app_icon_512x512_local.svg
diff --git a/...te-native/files/app_icon_512x512_stag.svg → ...ative/app/files/app_icon_512x512_stag.svg b/...te-native/files/app_icon_512x512_stag.svg → ...ative/app/files/app_icon_512x512_stag.svg
diff --git a/packages/suite-native/globalPolyfills.js → suite-native/app/globalPolyfills.js b/packages/suite-native/globalPolyfills.js → suite-native/app/globalPolyfills.js
diff --git a/packages/suite-native/index.js → suite-native/app/index.js b/packages/suite-native/index.js → suite-native/app/index.js
diff --git a/packages/suite-native/ios/Podfile → suite-native/app/ios/Podfile b/packages/suite-native/ios/Podfile → suite-native/app/ios/Podfile
diff --git a/packages/suite-native/ios/Podfile.lock → suite-native/app/ios/Podfile.lock b/packages/suite-native/ios/Podfile.lock → 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/...ios/TrezorSuite.xcodeproj/project.pbxproj → ...ios/TrezorSuite.xcodeproj/project.pbxproj b/...ios/TrezorSuite.xcodeproj/project.pbxproj → ...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 = "<group>"; };
 		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 = "<group>"; };
 		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 = "<group>"; };
+		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 = "<group>"; };
 		81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = TrezorSuite/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		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 = "<group>"; };
-		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 = "<group>"; };
-		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 = "<group>"; };
-		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 = "<group>"; };
+		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 = "<group>"; };
+		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 = "<group>"; };
+		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 = "<group>"; };
 		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 = "<group>";
@@ -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/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist b/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/...shareddata/xcschemes/TrezorSuite.xcscheme → ...shareddata/xcschemes/TrezorSuite.xcscheme b/...shareddata/xcschemes/TrezorSuite.xcscheme → ...shareddata/xcschemes/TrezorSuite.xcscheme
diff --git a/...uite.xcworkspace/contents.xcworkspacedata → ...uite.xcworkspace/contents.xcworkspacedata b/...uite.xcworkspace/contents.xcworkspacedata → ...uite.xcworkspace/contents.xcworkspacedata
diff --git a/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist b/...ace/xcshareddata/IDEWorkspaceChecks.plist → ...ace/xcshareddata/IDEWorkspaceChecks.plist
diff --git a/...uite-native/ios/TrezorSuite/AppDelegate.h → ...-native/app/ios/TrezorSuite/AppDelegate.h b/...uite-native/ios/TrezorSuite/AppDelegate.h → ...-native/app/ios/TrezorSuite/AppDelegate.h
diff --git a/...ite-native/ios/TrezorSuite/AppDelegate.mm → ...native/app/ios/TrezorSuite/AppDelegate.mm b/...ite-native/ios/TrezorSuite/AppDelegate.mm → ...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/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/...TrezorSuite/Images.xcassets/Contents.json → ...TrezorSuite/Images.xcassets/Contents.json b/...TrezorSuite/Images.xcassets/Contents.json → ...TrezorSuite/Images.xcassets/Contents.json
diff --git a/...s/suite-native/ios/TrezorSuite/Info.plist → suite-native/app/ios/TrezorSuite/Info.plist b/...s/suite-native/ios/TrezorSuite/Info.plist → suite-native/app/ios/TrezorSuite/Info.plist
@@ -36,7 +36,7 @@
 		</dict>
 	</dict>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string></string>
+	<string/>
 	<key>UIAppFonts</key>
 	<array>
 		<string>TTSatoshi-Bold.otf</string>

diff --git a/...e/ios/TrezorSuite/LaunchScreen.storyboard → ...p/ios/TrezorSuite/LaunchScreen.storyboard b/...e/ios/TrezorSuite/LaunchScreen.storyboard → ...p/ios/TrezorSuite/LaunchScreen.storyboard
diff --git a/packages/suite-native/ios/TrezorSuite/main.m → suite-native/app/ios/TrezorSuite/main.m b/packages/suite-native/ios/TrezorSuite/main.m → suite-native/app/ios/TrezorSuite/main.m
diff --git a/...te-native/ios/TrezorSuiteTests/Info.plist → ...ative/app/ios/TrezorSuiteTests/Info.plist b/...te-native/ios/TrezorSuiteTests/Info.plist → ...ative/app/ios/TrezorSuiteTests/Info.plist
diff --git a/...e/ios/TrezorSuiteTests/TrezorSuiteTests.m → ...p/ios/TrezorSuiteTests/TrezorSuiteTests.m b/...e/ios/TrezorSuiteTests/TrezorSuiteTests.m → ...p/ios/TrezorSuiteTests/TrezorSuiteTests.m
diff --git a/packages/suite-native/ios/fastlane/Fastfile → suite-native/app/ios/fastlane/Fastfile b/packages/suite-native/ios/fastlane/Fastfile → suite-native/app/ios/fastlane/Fastfile
diff --git a/packages/suite-native/metro.config.js → suite-native/app/metro.config.js b/packages/suite-native/metro.config.js → suite-native/app/metro.config.js
diff --git a/packages/suite-native/package.json → suite-native/app/package.json b/packages/suite-native/package.json → suite-native/app/package.json
diff --git a/packages/suite-native/react-native.config.js → suite-native/app/react-native.config.js b/packages/suite-native/react-native.config.js → 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 → suite-native/app/src/App.tsx b/packages/suite-native/src/App.tsx → suite-native/app/src/App.tsx
diff --git a/...s/suite-native/src/__tests__/App-test.tsx → suite-native/app/src/__tests__/App-test.tsx b/...s/suite-native/src/__tests__/App-test.tsx → suite-native/app/src/__tests__/App-test.tsx
diff --git a/suite-native/app/tsconfig.json 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 → suite-native/atoms/README.md b/packages/suite-native-atoms/README.md → suite-native/atoms/README.md
diff --git a/packages/suite-native-atoms/jest.config.js → suite-native/atoms/jest.config.js b/packages/suite-native-atoms/jest.config.js → suite-native/atoms/jest.config.js
diff --git a/packages/suite-native-atoms/package.json → suite-native/atoms/package.json b/packages/suite-native-atoms/package.json → suite-native/atoms/package.json
diff --git a/packages/suite-native-atoms/src/Box.tsx → suite-native/atoms/src/Box.tsx b/packages/suite-native-atoms/src/Box.tsx → suite-native/atoms/src/Box.tsx
diff --git a/.../suite-native-atoms/src/Button/Button.tsx → suite-native/atoms/src/Button/Button.tsx b/.../suite-native-atoms/src/Button/Button.tsx → suite-native/atoms/src/Button/Button.tsx
diff --git a/...te-native-atoms/src/Button/IconButton.tsx → suite-native/atoms/src/Button/IconButton.tsx b/...te-native-atoms/src/Button/IconButton.tsx → suite-native/atoms/src/Button/IconButton.tsx
diff --git a/...te-native-atoms/src/Button/TileButton.tsx → suite-native/atoms/src/Button/TileButton.tsx b/...te-native-atoms/src/Button/TileButton.tsx → suite-native/atoms/src/Button/TileButton.tsx
diff --git a/packages/suite-native-atoms/src/CheckBox.tsx → suite-native/atoms/src/CheckBox.tsx b/packages/suite-native-atoms/src/CheckBox.tsx → suite-native/atoms/src/CheckBox.tsx
diff --git a/packages/suite-native-atoms/src/Chip.tsx → suite-native/atoms/src/Chip.tsx b/packages/suite-native-atoms/src/Chip.tsx → suite-native/atoms/src/Chip.tsx
diff --git a/packages/suite-native-atoms/src/Hint.tsx → suite-native/atoms/src/Hint.tsx b/packages/suite-native-atoms/src/Hint.tsx → suite-native/atoms/src/Hint.tsx
diff --git a/...es/suite-native-atoms/src/Input/Input.tsx → suite-native/atoms/src/Input/Input.tsx b/...es/suite-native-atoms/src/Input/Input.tsx → suite-native/atoms/src/Input/Input.tsx
diff --git a/...e-native-atoms/src/Input/InputWrapper.tsx → ...e-native/atoms/src/Input/InputWrapper.tsx b/...e-native-atoms/src/Input/InputWrapper.tsx → ...e-native/atoms/src/Input/InputWrapper.tsx
diff --git a/...te-native-atoms/src/Input/SearchInput.tsx → suite-native/atoms/src/Input/SearchInput.tsx b/...te-native-atoms/src/Input/SearchInput.tsx → suite-native/atoms/src/Input/SearchInput.tsx
diff --git a/...te-native-atoms/src/ListItem/ListItem.tsx → suite-native/atoms/src/ListItem/ListItem.tsx b/...te-native-atoms/src/ListItem/ListItem.tsx → suite-native/atoms/src/ListItem/ListItem.tsx
diff --git a/...ative-atoms/src/ListItem/ListItemIcon.tsx → ...ative/atoms/src/ListItem/ListItemIcon.tsx b/...ative-atoms/src/ListItem/ListItemIcon.tsx → ...ative/atoms/src/ListItem/ListItemIcon.tsx
diff --git a/...ative-atoms/src/ListItem/ListItemText.tsx → ...ative/atoms/src/ListItem/ListItemText.tsx b/...ative-atoms/src/ListItem/ListItemText.tsx → ...ative/atoms/src/ListItem/ListItemText.tsx
diff --git a/...atoms/src/ListItem/SelectableListItem.tsx → ...atoms/src/ListItem/SelectableListItem.tsx b/...atoms/src/ListItem/SelectableListItem.tsx → ...atoms/src/ListItem/SelectableListItem.tsx
diff --git a/...ative-atoms/src/ListItem/listItemTypes.ts → ...ative/atoms/src/ListItem/listItemTypes.ts b/...ative-atoms/src/ListItem/listItemTypes.ts → ...ative/atoms/src/ListItem/listItemTypes.ts
diff --git a/...te-native-atoms/src/Modal/BottomModal.tsx → suite-native/atoms/src/Modal/BottomModal.tsx b/...te-native-atoms/src/Modal/BottomModal.tsx → suite-native/atoms/src/Modal/BottomModal.tsx
diff --git a/...-atoms/src/Modal/BottomModalContainer.tsx → .../atoms/src/Modal/BottomModalContainer.tsx b/...-atoms/src/Modal/BottomModalContainer.tsx → .../atoms/src/Modal/BottomModalContainer.tsx
diff --git a/...s/suite-native-atoms/src/NumPadButton.tsx → suite-native/atoms/src/NumPadButton.tsx b/...s/suite-native-atoms/src/NumPadButton.tsx → suite-native/atoms/src/NumPadButton.tsx
diff --git a/packages/suite-native-atoms/src/Radio.tsx → suite-native/atoms/src/Radio.tsx b/packages/suite-native-atoms/src/Radio.tsx → suite-native/atoms/src/Radio.tsx
diff --git a/.../suite-native-atoms/src/Select/Select.tsx → suite-native/atoms/src/Select/Select.tsx b/.../suite-native-atoms/src/Select/Select.tsx → suite-native/atoms/src/Select/Select.tsx
diff --git a/...te-native-atoms/src/Select/SelectItem.tsx → suite-native/atoms/src/Select/SelectItem.tsx b/...te-native-atoms/src/Select/SelectItem.tsx → suite-native/atoms/src/Select/SelectItem.tsx
diff --git a/...native-atoms/src/Select/SelectTrigger.tsx → ...native/atoms/src/Select/SelectTrigger.tsx b/...native-atoms/src/Select/SelectTrigger.tsx → ...native/atoms/src/Select/SelectTrigger.tsx
diff --git a/packages/suite-native-atoms/src/Switch.tsx → suite-native/atoms/src/Switch.tsx b/packages/suite-native-atoms/src/Switch.tsx → suite-native/atoms/src/Switch.tsx
diff --git a/packages/suite-native-atoms/src/Text.tsx → suite-native/atoms/src/Text.tsx b/packages/suite-native-atoms/src/Text.tsx → suite-native/atoms/src/Text.tsx
diff --git a/packages/suite-native-atoms/src/TipToast.tsx → suite-native/atoms/src/TipToast.tsx b/packages/suite-native-atoms/src/TipToast.tsx → suite-native/atoms/src/TipToast.tsx
diff --git a/packages/suite-native-atoms/src/VStack.tsx → suite-native/atoms/src/VStack.tsx b/packages/suite-native-atoms/src/VStack.tsx → suite-native/atoms/src/VStack.tsx
diff --git a/packages/suite-native-atoms/src/index.ts → suite-native/atoms/src/index.ts b/packages/suite-native-atoms/src/index.ts → suite-native/atoms/src/index.ts
diff --git a/suite-native/atoms/tsconfig.json 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 → suite-native/module-home/jest.config.js b/packages/suite-native-home/jest.config.js → suite-native/module-home/jest.config.js
diff --git a/packages/suite-native-home/package.json → suite-native/module-home/package.json b/packages/suite-native-home/package.json → suite-native/module-home/package.json
diff --git a/packages/suite-native-home/src/index.ts → suite-native/module-home/src/index.ts b/packages/suite-native-home/src/index.ts → suite-native/module-home/src/index.ts
diff --git a/...ome/src/navigation/HomeStackNavigator.tsx → ...ome/src/navigation/HomeStackNavigator.tsx b/...ome/src/navigation/HomeStackNavigator.tsx → ...ome/src/navigation/HomeStackNavigator.tsx
diff --git a/...uite-native-home/src/navigation/routes.ts → ...tive/module-home/src/navigation/routes.ts b/...uite-native-home/src/navigation/routes.ts → ...tive/module-home/src/navigation/routes.ts
diff --git a/...ative-home/src/screens/HomeDemoScreen.tsx → ...odule-home/src/screens/HomeDemoScreen.tsx b/...ative-home/src/screens/HomeDemoScreen.tsx → ...odule-home/src/screens/HomeDemoScreen.tsx
diff --git a/...te-native-home/src/screens/HomeScreen.tsx → ...ve/module-home/src/screens/HomeScreen.tsx b/...te-native-home/src/screens/HomeScreen.tsx → ...ve/module-home/src/screens/HomeScreen.tsx
diff --git a/packages/suite-native-atoms/tsconfig.json → suite-native/module-home/tsconfig.json b/packages/suite-native-atoms/tsconfig.json → 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/...es/suite-native-navigation/jest.config.js → suite-native/module-settings/jest.config.js b/...es/suite-native-navigation/jest.config.js → suite-native/module-settings/jest.config.js
diff --git a/packages/suite-native-settings/package.json → suite-native/module-settings/package.json b/packages/suite-native-settings/package.json → suite-native/module-settings/package.json
diff --git a/...gs/src/components/ApplicationSettings.tsx → ...gs/src/components/ApplicationSettings.tsx b/...gs/src/components/ApplicationSettings.tsx → ...gs/src/components/ApplicationSettings.tsx
diff --git a/...settings/src/components/CoinsSettings.tsx → ...settings/src/components/CoinsSettings.tsx b/...settings/src/components/CoinsSettings.tsx → ...settings/src/components/CoinsSettings.tsx
diff --git a/...gs/src/components/DeviceActionButtons.tsx → ...gs/src/components/DeviceActionButtons.tsx b/...gs/src/components/DeviceActionButtons.tsx → ...gs/src/components/DeviceActionButtons.tsx
diff --git a/...ettings/src/components/DeviceSettings.tsx → ...ettings/src/components/DeviceSettings.tsx b/...ettings/src/components/DeviceSettings.tsx → ...ettings/src/components/DeviceSettings.tsx
diff --git a/...ttings/src/components/SettingsSection.tsx → ...ttings/src/components/SettingsSection.tsx b/...ttings/src/components/SettingsSection.tsx → ...ttings/src/components/SettingsSection.tsx
diff --git a/...gs/src/components/SettingsSectionItem.tsx → ...gs/src/components/SettingsSectionItem.tsx b/...gs/src/components/SettingsSectionItem.tsx → ...gs/src/components/SettingsSectionItem.tsx
diff --git a/packages/suite-native-settings/src/index.ts → suite-native/module-settings/src/index.ts b/packages/suite-native-settings/src/index.ts → suite-native/module-settings/src/index.ts
diff --git a/...src/navigation/SettingsStackNavigator.tsx → ...src/navigation/SettingsStackNavigator.tsx b/...src/navigation/SettingsStackNavigator.tsx → ...src/navigation/SettingsStackNavigator.tsx
diff --git a/...-native-settings/src/navigation/routes.ts → .../module-settings/src/navigation/routes.ts b/...-native-settings/src/navigation/routes.ts → .../module-settings/src/navigation/routes.ts
diff --git a/...gs/src/screens/SettingsAdvancedScreen.tsx → ...gs/src/screens/SettingsAdvancedScreen.tsx b/...gs/src/screens/SettingsAdvancedScreen.tsx → ...gs/src/screens/SettingsAdvancedScreen.tsx
diff --git a/...gs/src/screens/SettingsLabelingScreen.tsx → ...gs/src/screens/SettingsLabelingScreen.tsx b/...gs/src/screens/SettingsLabelingScreen.tsx → ...gs/src/screens/SettingsLabelingScreen.tsx
diff --git a/...rc/screens/SettingsLocalisationScreen.tsx → ...rc/screens/SettingsLocalisationScreen.tsx b/...rc/screens/SettingsLocalisationScreen.tsx → ...rc/screens/SettingsLocalisationScreen.tsx
diff --git a/...e-settings/src/screens/SettingsScreen.tsx → ...e-settings/src/screens/SettingsScreen.tsx b/...e-settings/src/screens/SettingsScreen.tsx → ...e-settings/src/screens/SettingsScreen.tsx
diff --git a/...ges/suite-native-navigation/tsconfig.json → suite-native/module-settings/tsconfig.json b/...ges/suite-native-navigation/tsconfig.json → 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/...ite-native-navigation-root/jest.config.js → suite-native/navigation-root/jest.config.js b/...ite-native-navigation-root/jest.config.js → suite-native/navigation-root/jest.config.js
diff --git a/...suite-native-navigation-root/package.json → suite-native/navigation-root/package.json b/...suite-native-navigation-root/package.json → suite-native/navigation-root/package.json
diff --git a/...-root/src/dummyScreens/AccountsScreen.tsx → ...-root/src/dummyScreens/AccountsScreen.tsx b/...-root/src/dummyScreens/AccountsScreen.tsx → ...-root/src/dummyScreens/AccountsScreen.tsx
diff --git a/...on-root/src/dummyScreens/ActionScreen.tsx → ...on-root/src/dummyScreens/ActionScreen.tsx b/...on-root/src/dummyScreens/ActionScreen.tsx → ...on-root/src/dummyScreens/ActionScreen.tsx
diff --git a/...on-root/src/dummyScreens/PricesScreen.tsx → ...on-root/src/dummyScreens/PricesScreen.tsx b/...on-root/src/dummyScreens/PricesScreen.tsx → ...on-root/src/dummyScreens/PricesScreen.tsx
diff --git a/...suite-native-navigation-root/src/index.ts → suite-native/navigation-root/src/index.ts b/...suite-native-navigation-root/src/index.ts → suite-native/navigation-root/src/index.ts
diff --git a/...-root/src/navigation/RootTabNavigator.tsx → ...-root/src/navigation/RootTabNavigator.tsx b/...-root/src/navigation/RootTabNavigator.tsx → ...-root/src/navigation/RootTabNavigator.tsx
diff --git a/...on-root/src/navigation/navigationMap.d.ts → ...on-root/src/navigation/navigationMap.d.ts b/...on-root/src/navigation/navigationMap.d.ts → ...on-root/src/navigation/navigationMap.d.ts
diff --git a/...-navigation-root/src/navigation/routes.ts → .../navigation-root/src/navigation/routes.ts b/...-navigation-root/src/navigation/routes.ts → .../navigation-root/src/navigation/routes.ts
diff --git a/suite-native/navigation-root/tsconfig.json 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/...ages/suite-native-settings/jest.config.js → suite-native/navigation/jest.config.js b/...ages/suite-native-settings/jest.config.js → suite-native/navigation/jest.config.js
diff --git a/...ages/suite-native-navigation/package.json → suite-native/navigation/package.json b/...ages/suite-native-navigation/package.json → suite-native/navigation/package.json
diff --git a/...tive-navigation/src/components/Screen.tsx → ...tive/navigation/src/components/Screen.tsx b/...tive-navigation/src/components/Screen.tsx → ...tive/navigation/src/components/Screen.tsx
diff --git a/...avigation/src/components/ScreenHeader.tsx → ...avigation/src/components/ScreenHeader.tsx b/...avigation/src/components/ScreenHeader.tsx → ...avigation/src/components/ScreenHeader.tsx
diff --git a/...tive-navigation/src/components/TabBar.tsx → ...tive/navigation/src/components/TabBar.tsx b/...tive-navigation/src/components/TabBar.tsx → ...tive/navigation/src/components/TabBar.tsx
diff --git a/...-navigation/src/components/TabBarItem.tsx → .../navigation/src/components/TabBarItem.tsx b/...-navigation/src/components/TabBarItem.tsx → .../navigation/src/components/TabBarItem.tsx
diff --git a/...ges/suite-native-navigation/src/config.ts → suite-native/navigation/src/config.ts b/...ges/suite-native-navigation/src/config.ts → suite-native/navigation/src/config.ts
diff --git a/...ages/suite-native-navigation/src/index.ts → suite-native/navigation/src/index.ts b/...ages/suite-native-navigation/src/index.ts → suite-native/navigation/src/index.ts
diff --git a/...ges/suite-native-navigation/src/types.tsx → suite-native/navigation/src/types.tsx b/...ges/suite-native-navigation/src/types.tsx → suite-native/navigation/src/types.tsx
diff --git a/suite-native/navigation/tsconfig.json 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" }
+    ]
+}