fix crash on ios

Signed-off-by: Andrey Shovkoplyas <motor4ik@gmail.com>

.babelrc

@@ -0,0 +1,5 @@
+{
+  "presets": [
+    "module:metro-react-native-babel-preset"
+  ]
+}

.carve_ignore

@@ -1,236 +0,0 @@
-status-im.utils.build/warning-handler
-status-im.utils.build/get-current-sha
-status-im2.constants/spacing-char
-status-im2.constants/arg-wrapping-char
-status-im.ios.core/init
-status-im.ui.components.camera/aspects
-status-im.ui.components.camera/capture-targets
-status-im.ui.components.camera/set-torch
-status-im.ui.components.camera/request-access-ios
-status-im.chat.models.message-content/stylings
-status-im.chat.models.message-content/actions
-status-im.chat.models.message-content/blank-string
-status-im.chat.models.message-content/sorted-ranges
-status-im.ethereum.mnemonic/words->passphrase
-native-module.core/listener
-native-module.core/multiaccount-reset
-native-module.core/extract-group-membership-signatures
-native-module.core/sign-group-membership
-native-module.core/update-mailservers
-status-im.ethereum.abi-spec/bytes-to-hex
-status-im.android.core/init
-status-im.chat.models.message/transport-keys
-status-im.utils.datetime/week
-status-im.utils.datetime/time-ago
-status-im.utils.datetime/format-date
-status-im.utils.datetime/get-ordinal-date
-reagent.dom/render
-reagent.dom/unmount-component-at-node
-reagent.dom/dom-node
-reagent.dom/force-update-all
-status-im.multiaccounts.create.core/get-new-key-code
-status-im.ethereum.decode/string
-status-im.ui.screens.network.views/mainnet?
-status-im.data-store.chats/event->string
-status-im.mailserver.constants/seven-days
-status-im.mailserver.constants/connection-timeout
-status-im.hardwallet.card/install-applet
-status-im.hardwallet.card/install-cash-applet
-status-im.multiaccount.login.data-test/all-contacts
-status-im.multiaccount.login.data-test/multiaccounts
-status-im.multiaccount.login.data-test/get-chats
-status-im.multiaccount.login.data-test/transport
-status-im.multiaccount.login.data-test/topics
-status-im.utils.utils/clear-timeout
-status-im.utils.handlers/logged-in
-status-im.multiaccounts.model/credentials
-status-im.multiaccounts.login.core/contract-fleet?
-status-im.multiaccounts.login.core/fetch-nodes
-status-im2.config/rpc-networks-only?
-status-im2.config/waku-enabled?
-status-im.utils.pairing/has-paired-installations?
-status-im.tribute-to-talk.core-test/user-cofx
-quo.gesture-handler/tap-gesture-handler
-quo.gesture-handler/pan-gesture-handler
-quo.gesture-handler/long-press-gesture-handler
-quo.gesture-handler/pure-native-button
-quo.gesture-handler/createNativeWrapper
-quo.gesture-handler/animated-raw-button
-quo.gesture-handler/states
-mocks.js-dependencies/action-button
-mocks.js-dependencies/camera
-mocks.js-dependencies/dismiss-keyboard
-mocks.js-dependencies/emoji-picker
-mocks.js-dependencies/i18n
-mocks.js-dependencies/qr-code
-mocks.js-dependencies/svg
-mocks.js-dependencies/icons
-mocks.js-dependencies/webview
-mocks.js-dependencies/desktop-linking
-mocks.js-dependencies/desktop-shortcuts
-mocks.js-dependencies/snoopy
-mocks.js-dependencies/snoopy-filter
-mocks.js-dependencies/snoopy-bars
-mocks.js-dependencies/snoopy-buffer
-mocks.js-dependencies/desktop-menu
-mocks.js-dependencies/desktop-config
-mocks.js-dependencies/react-native-navigation-twopane
-mocks.js-dependencies/react-native-screens
-mocks.js-dependencies/react-native-shake
-mocks.js-dependencies/back-handler
-mocks.js-dependencies/react
-mocks.js-dependencies/react-navigation-native
-mocks.js-dependencies/react-navigation-stack
-mocks.js-dependencies/react-navigation-bottom-tabs
-mocks.js-dependencies/react-native-haptic-feedback
-mocks.js-dependencies/mock
-quo.previews.main/init
-status-im.chat.models.message-list-test/descending-range
-status-im.chat.models.message-list-test/random-range
-status-im.ethereum.eip165/supports?
-status-im.utils.hex/valid-hex?
-status-im.multiaccounts.core/chat-send?
-status-im.hardwallet.simulated-keycard/install-cash-applet
-status-im.hardwallet.simulated-keycard/sign-typed-data
-status-im.utils.core/safe-read-message-content
-status-im.ui.components.react/native-modules
-status-im.ui.components.react/progress-bar
-react-native.fs/move-file
-react-native.fs/read-dir
-react-native.fs/mkdir
-react-native.fs/unlink
-react-native.fs/file-exists?
-quo.animated/code
-quo.animated/eq
-quo.animated/neq
-quo.animated/greater-or-eq
-quo.animated/not*
-quo.animated/or*
-quo.animated/and*
-quo.animated/add
-quo.animated/sub
-quo.animated/multiply
-quo.animated/abs
-quo.animated/min*
-quo.animated/max*
-quo.animated/set
-quo.animated/start-clock
-quo.animated/stop-clock
-quo.animated/bezier
-quo.animated/linear
-quo.animated/set-value
-quo.animated/clock
-quo.animated/debug
-quo.animated/log
-quo.animated/event
-quo.animated/on-change
-quo.animated/cond*
-quo.animated/block
-quo.animated/call*
-quo.animated/timing
-quo.animated/spring
-quo.animated/clamp
-quo.animated/with-spring
-quo.animated/with-timing
-quo.animated/re-timing
-quo.design-system.colors/white
-quo.design-system.colors/black
-status-im.transport.core-test/messages
-status-im.ethereum.core/sidechain?
-status-im.ethereum.core/network-with-upstream-rpc?
-status-im.ethereum.core/current-address
-status-im.ethereum.core/network->network-name
-status-im.ethereum.core/estimate-gas
-quo.core/animated-header
-quo.core/safe-area-provider
-quo.core/safe-area-consumer
-quo.core/safe-area-view
-status-im.utils.universal-links.core/open!
-status-im.transport.filters.core-test/member-2
-status-im.ui.screens.chat.ttt/one-to-one-chat-description-container
-status-im.ethereum.ens/ttl
-status-im.ethereum.ens/addr-hash
-status-im.ethereum.ens/name-hash
-status-im.ethereum.ens/ABI-hash
-status-im.ethereum.ens/pubkey-hash
-status-im.network.core/get-network
-status-im2.constants/desktop-content-types
-status-im2.constants/blocks-per-hour
-status-im2.constants/one-earth-day
-status-im2.constants/left-pane-min-width
-status-im2.constants/system
-status-im2.constants/contact-discovery
-status-im2.constants/send-transaction-failed-parse-response
-status-im2.constants/send-transaction-failed-parse-params
-status-im2.constants/send-transaction-no-account-selected
-status-im2.constants/send-transaction-invalid-tx-sender
-status-im2.constants/web3-get-logs
-status-im2.constants/web3-transaction-receipt
-status-im2.constants/web3-new-filter
-status-im2.constants/web3-new-pending-transaction-filter
-status-im2.constants/web3-new-block-filter
-status-im2.constants/web3-uninstall-filter
-status-im2.constants/web3-get-filter-changes
-status-im2.constants/web3-shh-post
-status-im2.constants/web3-shh-new-identity
-status-im2.constants/web3-shh-has-identity
-status-im2.constants/web3-shh-new-group
-status-im2.constants/web3-shh-add-to-group
-status-im2.constants/web3-shh-new-filter
-status-im2.constants/web3-shh-uninstall-filter
-status-im2.constants/web3-shh-get-filter-changes
-status-im2.constants/web3-shh-get-messages
-status-im2.constants/status-create-address
-status-im2.constants/event-transfer-hash
-status-im2.constants/regx-rtl-characters
-status-im2.constants/desktop-msg-chars-hard-limit
-status-im2.constants/debug-metrics
-status-im2.constants/scan-qr-code
-status-im2.constants/ipfs-proto-code
-status-im2.constants/swarm-proto-code
-status-im.multiaccounts.update.publisher/publish-update!
-status-im.utils.async/task-queue
-status-im.utils.async/async-periodic-run!
-status-im.desktop.core/app-root
-status-im.desktop.core/init
-status-im.chat.models-test/test-db
-quo.design-system.spacing/padding-vertical
-status-im.utils.money/percent-change
-status-im.utils.platform/isMacOs?
-status-im.utils.platform/isNix?
-status-im.utils.platform/isWin?
-status-im.utils.platform/android-version>=
-utils.debounce/clear-all
-status-im.transport.db/create-chat
-status-im.utils.priority-map/priority-map
-status-im.utils.priority-map/priority-map-by
-status-im.utils.priority-map/priority-map-keyfn
-status-im.utils.priority-map/empty-message-map
-status-im.wallet.choose-recipient.core/use-default-eth-gas
-status-im.ui.components.animation/decay
-status-im.ui.components.animation/remove-all-listeners
-status-im.ui.components.animation/stop-animation
-status-im.ui.components.animation/animated
-status-im.ui.components.animation/add
-status-im.ui.components.animation/subtract
-status-im.ui.components.animation/get-layout
-status-im.wallet.transactions-test/uri-query-data
-quo.react-native/touchable-highlight
-status-im.utils.name/shortened-name
-status-im.ui.components.button.haptic/trigger
-status-im.contact.db/filter-dapps
-status-im.contact.db/filter-group-contacts
-status-im.contact.db/legacy-pending?
-status-im.utils.transducers-test/preview-call-1
-status-im.utils.transducers-test/preview-call-2
-status-im.utils.types/to-string
-status-im.chat.db/datemark?
-status-im.chat.db/gap?
-status-im.chat.db/map->sorted-seq
-status-im.utils.snoopy/status-module-filter
-status-im.utils.snoopy/websocket-filter
-status-im.utils.snoopy/touches-filter
-status-im.utils.snoopy/native-animation-filter
-status-im.utils.snoopy/keyboard-observer-filter
-status-im.utils.multihash/hex
-status-im.utils.multihash/decode-array

.clj-kondo/config.edn

@@ -1,38 +1,6 @@
-{:lint-as      {status-im.utils.views/defview  clojure.core/defn
-                status-im.utils.views/letsubs  clojure.core/let
-                reagent.core/with-let          clojure.core/let
-                status-im.utils.fx/defn        clj-kondo.lint-as/def-catch-all
-                utils.re-frame/defn            clj-kondo.lint-as/def-catch-all
-                quo.react/with-deps-check      clojure.core/fn
-                quo.previews.preview/list-comp clojure.core/for
-                status-im.utils.styles/def     clojure.core/def
-                status-im.utils.styles/defn    clojure.core/defn
-                test-helpers.unit/deftest-sub  clojure.core/defn
-                taoensso.tufte/defnp           clojure.core/defn}
- :linters      {:consistent-alias  {:level   :error
-                                    :aliases {clojure.string  string
-                                              clojure.set     set
-                                              clojure.walk    walk
-                                              taoensso.timbre log}}
-                :shadowed-var      {:level   :error
-                                    ;; We temporarily use :include to define an
-                                    ;; allowlist of core Clojure vars. In the
-                                    ;; future, as we progressively fix shadowed
-                                    ;; vars, we should be able to delete this
-                                    ;; option and lint all vars.
-                                    :include [comparator
-                                              count
-                                              identity
-                                              iter
-                                              key
-                                              str
-                                              symbol
-                                              time
-                                              val]}
-                :invalid-arity     {:skip-args [status-im.utils.fx/defn utils.re-frame/defn]}
-                ;; TODO remove number when this is fixed
-                ;; https://github.com/borkdude/clj-kondo/issues/867
-                :unresolved-symbol {:exclude [PersistentPriorityMap.EMPTY
-                                              number
-                                              status-im.test-helpers/restore-app-db]}}
- :config-in-ns {mocks.js-dependencies {:linters {:clojure-lsp/unused-public-var {:level :off}}}}}
+{:lint-as {status-im.utils.views/defview clojure.core/defn
+           status-im.utils.views/letsubs clojure.core/let
+           status-im.utils.fx/defn       clojure.core/defn
+           status-im.utils.styles/def    clojure.core/def
+           status-im.utils.styles/defn   clojure.core/defn}
+ :linters {:invalid-arity {:skip-args [status-im.utils.fx/defn]}}}

.dependabot/config.yml

@@ -13,7 +13,7 @@ update_configs:
           update_type: "security"
   # Keep /mobile/js_files/yarn.lock up to date, batching pull requests weekly
   - package_manager: "javascript"
-    directory: "/"
+    directory: "/mobile/js_files"
     update_schedule: "weekly"
     allowed_updates:
     - match:

.env

@@ -2,11 +2,14 @@ CACHED_WEBVIEWS_ENABLED=1
 DEBUG_WEBVIEW=1
 DEFAULT_NETWORK=mainnet_rpc
 DEV_BUILD=1
+ERC20_CONTRACT_WARNINGS=0
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=status.prod
+FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
-LOG_LEVEL=info
+HARDWALLET_ENABLED=1
+LOG_LEVEL_STATUS_GO=info
+LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
 PFS_TOGGLE_VISIBLE=1
@@ -16,19 +19,8 @@ SNOOPY=0
 RPC_NETWORKS_ONLY=0
 PARTITIONED_TOPIC=0
 CONTRACT_NODES=1
+MOBILE_UI_FOR_DESKTOP=1
 STATUS_GO_PROTOCOL=0
 STATUS_GO_ENABLE_NIMBUS=0
 KEYCARD_TEST_MENU=0
-QR_READ_TEST_MENU=1
-ENABLE_ROOT_ALERT=1
-ENABLE_QUO_PREVIEW=1
-APN_TOPIC=im.status.ethereum.pr
-COMMUNITIES_ENABLED=1
-DATABASE_MANAGEMENT_ENABLED=1
-DELETE_MESSAGE_ENABLED=1
-COLLECTIBLES_ENABLED=1
-COMMANDS_ENABLED=1
-TWO_MINUTES_SYNCING=1
-SWAP_ENABLED=1
-STICKERS_TEST_ENABLED=1
-LOCAL_PAIRING_ENABLED=1
+QR_READ_TEST_MENU=1

.env.e2e

@@ -1,9 +1,12 @@
 DEBUG_WEBVIEW=1
-DEFAULT_NETWORK=goerli_rpc
+DEFAULT_NETWORK=testnet_rpc
+ERC20_CONTRACT_WARNINGS=1
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=status.prod
+FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
+HARDWALLET_ENABLED=1
+LOG_LEVEL_STATUS_GO=info
 LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=0
 PAIRING_POPUP_DISABLED=1
@@ -15,21 +18,9 @@ SNOOPY=0
 STICKERS_ENABLED=1
 PARTITIONED_TOPIC=0
 CONTRACT_NODES=1
+MOBILE_UI_FOR_DESKTOP=1
 BLANK_PREVIEW=0
 TOOLTIP_EVENTS=1
 COMMANDS_ENABLED=1
 KEYCARD_TEST_MENU=1
-QR_READ_TEST_MENU=1
-ENABLE_ROOT_ALERT=0
-APN_TOPIC=im.status.ethereum.pr
-VERIFY_TRANSACTION_CHAIN_ID=5
-VERIFY_ENS_CHAIN_ID=5
-TEST_STATEOFUS=1
-DATABASE_MANAGEMENT_ENABLED=1
-COMMUNITIES_ENABLED=1
-COMMUNITIES_MANAGEMENT_ENABLED=1
-DELETE_MESSAGE_ENABLED=1
-TWO_MINUTES_SYNCING=1
-STICKERS_TEST_ENABLED=1
-LOCAL_PAIRING_ENABLED=1
-FAST_CREATE_COMMUNITY_ENABLED=1
+QR_READ_TEST_MENU=1

.env.jenkins

@@ -1,10 +1,13 @@
 CACHED_WEBVIEWS_ENABLED=1
 DEBUG_WEBVIEW=1
-DEFAULT_NETWORK=goerli_rpc
+DEFAULT_NETWORK=mainnet_rpc
+ERC20_CONTRACT_WARNINGS=0
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=status.prod
+FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
+HARDWALLET_ENABLED=1
+LOG_LEVEL_STATUS_GO=info
 LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 MAINNET_WARNING_ENABLED=1
@@ -16,22 +19,5 @@ SNOOPY=0
 RPC_NETWORKS_ONLY=0
 PARTITIONED_TOPIC=0
 CONTRACT_NODES=1
+MOBILE_UI_FOR_DESKTOP=1
 STATUS_GO_ENABLE_NIMBUS=0
-COMMANDS_ENABLED=1
-KEYCARD_TEST_MENU=0
-ENABLE_ROOT_ALERT=1
-DISABLE_WALLET_ON_MOBILE_NETWORK=1
-APN_TOPIC=im.status.ethereum.pr
-VERIFY_TRANSACTION_CHAIN_ID=5
-VERIFY_ENS_CHAIN_ID=5
-TEST_STATEOFUS=1
-BLANK_PREVIEW=0
-DATABASE_MANAGEMENT_ENABLED=1
-COMMUNITIES_ENABLED=1
-COMMUNITIES_MANAGEMENT_ENABLED=1
-DELETE_MESSAGE_ENABLED=1
-TWO_MINUTES_SYNCING=1
-ENABLE_QUO_PREVIEW=1
-STICKERS_TEST_ENABLED=1
-LOCAL_PAIRING_ENABLED=1
-FAST_CREATE_COMMUNITY_ENABLED=1

.env.nightly

@@ -1,10 +1,12 @@
 DEBUG_WEBVIEW=1
 DEFAULT_NETWORK=mainnet_rpc
+ERC20_CONTRACT_WARNINGS=0
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=status.prod
+FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
-LOG_LEVEL=info
+LOG_LEVEL_STATUS_GO=info
+LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 MAINNET_WARNING_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
@@ -12,13 +14,8 @@ PFS_TOGGLE_VISIBLE=1
 POW_TARGET=0.002
 POW_TIME=1
 SNOOPY=0
-KEYCARD_TEST_MENU=0
 RPC_NETWORKS_ONLY=0
 PARTITIONED_TOPIC=0
 CONTRACT_NODES=1
-ENABLE_ROOT_ALERT=1
-BLANK_PREVIEW=0
-COMMUNITIES_ENABLED=1
-DATABASE_MANAGEMENT_ENABLED=1
-DELETE_MESSAGE_ENABLED=1
-FAST_CREATE_COMMUNITY_ENABLED=0
+MOBILE_UI_FOR_DESKTOP=1
+HARDWALLET_ENABLED=1

.env.release

@@ -1,10 +1,12 @@
 DEBUG_WEBVIEW=0
 DEFAULT_NETWORK=mainnet_rpc
+ERC20_CONTRACT_WARNINGS=0
 ETHEREUM_DEV_CLUSTER=0
 EXTENSIONS=0
-FLEET=status.prod
+FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
-LOG_LEVEL=
+LOG_LEVEL_STATUS_GO=
+LOG_LEVEL=info
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 MAINNET_WARNING_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
@@ -12,10 +14,7 @@ PFS_TOGGLE_VISIBLE=0
 POW_TARGET=0.002
 POW_TIME=1
 SNOOPY=0
-KEYCARD_TEST_MENU=0
 RPC_NETWORKS_ONLY=1
 PARTITIONED_TOPIC=0
-ENABLE_ROOT_ALERT=1
-MAX_IMAGES_BATCH=1
-DELETE_MESSAGE_ENABLED=1
-COLLECTIBLES_ENABLED=1
+MOBILE_UI_FOR_DESKTOP=1
+LOCAL_NOTIFICATIONS=0

.envrc

@@ -1 +1 @@
-layout node
+layout node

.eslintrc.js

@@ -1,4 +1,4 @@
 module.exports = {
-  root: true,
-  extends: '@react-native-community',
-};
+    root: true,
+    extends: '@react-native-community',
+  };

.flowconfig

@@ -94,4 +94,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 
 [version]
-^0.122.0
+^0.105.0

.github/CODEOWNERS

@@ -5,6 +5,8 @@
 # the repo. Unless a later match takes precedence,
 # @global-owner1 and @global-owner2 will be requested for
 # review when someone opens a pull request.
+*       @status-im/status-core
+
 /ci                 @jakubgs
 /fastlane           @jakubgs
 /scripts            @jakubgs
@@ -22,4 +24,12 @@
 
 /components @status-im/status-core-ui
 
-/test/appium/ @churik
+desktop/                        @vkjr
+modules/react-native-desktop*/  @vkjr
+modules/react-native-desktop*/  @vkjr
+
+/doc        @oskarth @yenda @jeluard
+
+/deployment @vkjr
+
+/test/appium/    @antdanchenko @churik

.github/CONTRIBUTING.md

@@ -8,9 +8,10 @@ These are just guidelines, not rules. Use your best judgment, and feel free to p
 
 #### What should I know before I get started?
 
-* [Mission and Principles](https://status.im/about)
+* [Mission and Core Values](https://status.im/contribute)
+* [Principles](https://status.im/contribute/our_principles.html)
 * [Read our FAQ](https://status.im/docs/FAQs.html)
 * [Join our Chat](http://join.status.im/chat/public/status-core-dev)
 * [Developer Introduction](https://status.im/developer_tools/)
-* [Build Status Yourself](https://status.im/technical/build_status)
+* [Build Status Yourself](https://status.im/build_status)
 * [Find issues to work on](https://github.com/status-im/)

.github/ISSUE_TEMPLATE.md

@@ -43,4 +43,4 @@ As a <user|developer|...>, I want to <task> so that <goal>.
 [comment]: # (if on Android please replicate bug whilst running adb logcat)
 ```
 ...
-```
+```

.github/ISSUE_TEMPLATE/bug-report.md

@@ -1,34 +1,54 @@
 ---
-name: MVPBug Report
-about: MVPBug Report
+name: Bug Report
+about: Bug Report
 title: ''
-labels: 'E:Mobile Bug MVP'
+labels: bug
 assignees: ''
 
 ---
 
 # Bug Report
 
+## Problem
 
-## Problem 
-[comment]: # (A problem description)
-
+An overview of the background required to understand the problem.
+A problem description.
 
 #### Expected behavior
 
+[comment]: # (Describe what you expected to happen. Please include designs if possible.)
 
 #### Actual behavior
 
+[comment]: # (Describe what actually happened. Please include screenshots if possible.)
+
+#### Notes
+
+For the developer who will be investigating. Is it related to another PR? Tips on where to start? 
+
+#### Acceptance Criteria
+
+Rules for the future PR to be accepted.
 
 ### Reproduction
 
-1. 
+[comment]: # (Describe how we can replicate the bug step by step.)
+
+- Open Status
+- ...
+- Step 3, etc.
 
 ### Additional Information
 
-- Status version: nightly 
-- Operating System: Android, iOS
+[comment]: # (Please do your best to fill this out.)
+- Status version: ...
+[comment]: # (Android or iOS.)
+- Operating System: <Android|iOS>
 
+#### Logs
 
-[comment]: # (Please, add logs/notes if necessary)
+[comment]: # (if on Android please replicate bug whilst running adb logcat)
 
+```
+...
+```

.github/ISSUE_TEMPLATE/release-issue.md

@@ -1,77 +0,0 @@
----
-name: Release umbrella issue
-about: Release Issue
-title: 'Mobile release '
-labels: release
-assignees: ''
-
----
-Issue to manage mobile release <version>
-
-### Scope
-[comment]: # (Add milestone from github)
-https://github.com/status-im/status-mobile/milestone/
-
-- release notes: 
-- release branch: 
-
-
-### Testing info 
-[comment]: # (TestRail info, added by QA)
-Main test suite: 
-Upgrade (e2e): 
-
-### Builds in TestFlight and PlayStore to push as a release
-[comment]: # (Will be added by QA after testing approving of build)
-
-### Process
-#### 1) Kick-off
-- [ ] 1. Translation PRs is merged before cutting branch (Jinho)
-- [ ] 2. Prepare scope of visible changes based on commits history, started from previous release branch cut ([guide](https://notes.status.im/how-to-prepare-release-notes))
-- [ ] 3. Update [RELEASES.md](https://github.com/status-im/status-mobile/blob/develop/RELEASES.md) with release notes (make PR based on previous step)
-- [ ] 4. Create release branch using this [guide](https://github.com/status-im/status-mobile/blob/develop/doc/RELEASE_GUIDE.md), bump VERSION (merge created PR ([example](https://github.com/status-im/status-mobile/pull/12504) ) to develop) and get successful release builds (so, testing can be started)
-- [ ] 5. Based on release scope, ask for comms (Jonny) 
-- [ ] 6. Make sure that assets (screenshots, video) in stores are up-to-date, more info [here](https://notes.status.im/how-to-update-assets)
-
-#### 2) Testing
-[comment]: # (Section will be maintained by QA)
-- [ ] Dogfooding (add notes, if it was held) 
-- [ ] Regression testing for release candidate build
-- [ ] Upgrade tests
-- [ ] Fix known blocker(s) found during regression testing
-
-##### Blockers
-[comment]: # (Section for blocker issues; should be fixed and merged by release-manager. Remove if no blockers found)
-- [ ] 1 blocker:
-
-=============================================================================================
-
-- [ ] Cherry-pick fix(es) to the release branch
-- [ ] Verify fix(es) on new release candidate build
-- [ ] Retest
-- [ ] Keep release build forever (button in Jenkins)
-
-#### 3) Submission
-
-- [ ] 1. Prepare PR for F-droid build ([instruction]( https://github.com/status-im/status-mobile/blob/develop/doc/FDROID.md))
-- [ ] 2. Release notes written and added (500 character limit for updates (Android) and PR for [RELEASES.md](https://github.com/status-im/status-mobile/blob/develop/RELEASES.md) is ready to be merged (from 1.3 step)
-- [ ] 3. Submit beta version for Android (Open Testing in Play Store)
-- [ ] 4. Submit iOS build to Apple review ([instruction](https://drive.google.com/file/d/10Cl7PBB7TFPkZiVbfzdFGpfMRP9bxXuq/view?usp=sharing), be careful - low quality of audio)
-- [ ] 5. Play store content reviewed and updated
-- [ ] 6. Privacy policy reviewed and updated (ask in channel)
-- [ ] 7. Countries to be excluded (ask in channel) 
-- [ ] 8. Changes to our FAQ made (should be checked and if any changes needed, ask Jakub to made them)
-
-
-#### 4) Before publishing
-- [ ] 1. Translations for comms available (marketing, ask in the channel)
-- [ ] 2. Promotional content ready (marketing, ask in channel)
-- [ ] 3. Upload builds for DO store,  https://dev.status.im/ (Jakub)
-
-#### 5) At time of publishing
-- [ ] 1. Notify marketing to push comms and blog post (Jonny + get review on blog from QA team)
-- [ ] 2. Publish release to app store and playstore
-- [ ] 3. Final push to update prod site https://status.im/,  [instructions](https://github.com/status-im/infra-docs/blob/master/articles/status_release_upload.md) (Jakub - requires credentials to upload) 
-- [ ] 4. Add the link to the post about the release and publish the release: https://github.com/status-im/status-mobile/releases (Jakub)
-- [ ] 5. Merge PR for updating [RELEASES.md](https://github.com/status-im/status-mobile/blob/develop/RELEASES.md) (from 1.3 step)
-

.github/ISSUE_TEMPLATE/wont-fix-bug.md

@@ -1,30 +0,0 @@
----
-name: Wont fix Report 
-about: to facilitate future handling, identify and address non-urgent issues that won't be prioritized in the near future
-title: ''
-labels: likely_wont_fix
-assignees: ''
-
----
-
-## Problem
-
-
-#### Expected behavior
-
-
-#### Actual behavior
-
-
-### Reproduction
-
-1. 
-
-### Additional Information
-
-- Status version: release 
-- Operating System: Android, iOS
-
-
-[comment]: # (Please, add logs/notes if necessary)
-

.github/github-bot.yml

@@ -9,9 +9,21 @@ project-board:
   test-column-name: 'E2E Tests'
 
 automated-tests:
-  repo-full-name: 'status-im/status-mobile'
-  job-full-name: 'status-mobile/e2e/status-app-prs'
+  repo-full-name: 'status-im/status-react'
+  job-full-name: 'end-to-end-tests/status-app-prs'
   kickoff-column-name: 'E2E Tests'
 
 github-team:
   slug: 'clojure'
+
+prchecklist:
+  title: Pull Request Checklist
+  checklist:
+    - '**Docs**: Updated the [documentation](https://status.im/build_status/), if affected'
+    - '**Docs**: Added or updated inline comments explaining intention of the code'
+    - '**Tests**: Ensured that all new UI elements have been assigned accessibility IDs'
+    - '**Tests**: Signaled need for E2E tests with label, if applicable'
+    - '**Tests**: Briefly described what was tested and what platforms were used'
+    - '**UI**: In case of UI changes, ensured that UI matches [Figma](https://www.figma.com/)'
+    - '**UI**: In case of UI changes, requested review from a Core UI designer'
+    - '**UI**: In case of UI changes, included screenshots of implementation'

.gitignore

@@ -7,8 +7,6 @@
 
 # Xcode
 #
-/ios/.xcode.env.local
-/component-spec
 result/
 build/
 *.pbxuser
@@ -27,6 +25,7 @@ DerivedData
 *.ipa
 *.xcuserstate
 project.xcworkspace
+xcshareddata
 
 # Android/IJ
 #
@@ -41,8 +40,8 @@ local.properties
 .tags*
 
 # VS Code
-.vscode/
-workspace.code-workspace
+.vscode/ipch/
+.vscode/settings.json
 
 # node.js
 #
@@ -69,6 +68,9 @@ env/dev/env/config.cljs
 externs/
 shim.js
 
+# Desktop build
+index.desktop.js
+
 # Generated by lein voom
 #
 /pom.xml
@@ -84,9 +86,6 @@ figwheel_server.log
 .lein-failures
 .lein-repl-history
 
-# Shadow
-.shadow-cljs
-
 ## Doo
 #
 out
@@ -97,11 +96,9 @@ doo-index.html
 
 # Status
 Statusgo.framework
-Statusgo.xcframework
 
 #ios
 /ios/Pods/
-/ios/logs/
 /ios/StatusIm.xcworkspace
 .ruby-version
 status-e2e/
@@ -127,8 +124,11 @@ fastlane/README.md
 # emacs
 .dir-locals.el
 
-# We don't use NPM
+#ignore platform-specific files in the root since they are only symlinks to files in folders 'desktop/js_files' and 'mobile/js_files'
 /package-lock.json
+/package.json
+/metro.config.js
+/yarn.lock
 /.re-natal
 /re-natal
 
@@ -136,6 +136,27 @@ fastlane/README.md
 pkg
 /BUILD_NUMBER
 
+# Status Desktop
+cmake_install.cmake
+CMakeCache.txt
+**/CMakeFiles/
+/StatusImPackage/*
+*.AppImage
+Status-Windows-x86_64.exe
+/desktop/bin/*
+/desktop/lib/*
+/desktop/modules/*
+/desktop/Makefile
+/desktop/graph_info.json
+/desktop/run-app.bat
+/desktop/run-app.sh
+/desktop/CMakeFiles/
+/desktop/reportApp/Makefile
+/deployment/windows/Status.rc
+*_autogen/
+CompleteBundleWin.cmake
+logger_settings.ini
+
 # Conan
 conan*.txt
 conanbuildinfo.*
@@ -163,30 +184,4 @@ status-modules/resources
 /fiddle/target/
 /fiddle/resources/public/images/
 
-trace.edn
-
-/app/
-project.clj
-
-##appium
-test/appium/report/
-result.xml
-test/appium/tests/users.py
-
-##node bindings
-/bin/
-/lib/
-
-## visual tests
-/artifacts
-
-/.calva/
-
-## component-tests
-*.log
-
-## local xcode env introduced in react-native 0.69
-.xcode.env.local
-
-## git hooks
-lefthook.yml
+trace.edn

.prettierignore

@@ -1,9 +0,0 @@
-*
-!*.js
-!*/
-*.clj-kondo
-*.shadow-cljs
-modules
-result
-target
-component-spec

.prettierrc.js

@@ -1,9 +1,6 @@
 module.exports = {
-  arrowParens: 'always',
-  printWidth: 120,
-  semi: true,
-  singleQuote: true,
-  tabWidth: 2,
-  trailingComma: 'all',
-  useTabs: false,
-};
+    bracketSpacing: false,
+    jsxBracketSameLine: true,
+    singleQuote: true,
+    trailingComma: 'all',
+  };

.vscode/settings.json

@@ -0,0 +1,10 @@
+{
+  "files.associations": {
+    "*.android": "groovy",
+    "*.ios": "groovy",
+    "*.linux": "groovy",
+    "*.macos": "groovy",
+    "*.windows": "groovy",
+    "*.nix-cache": "groovy",
+  },
+}

.zprintrc

@@ -1,53 +0,0 @@
-;; -*- mode: clojure -*-
-;; vi: ft=clojure
-{:width     105
- :style     [;; community style
-             ;; https://github.com/kkinnear/zprint/blob/main/doc/reference.md#community
-             :community
-
-             ;; no comma in map
-             :no-comma
-
-             :custom-justify
-
-             ;; respect all newlines
-             ;; https://github.com/kkinnear/zprint/blob/main/doc/reference.md#respect-nl
-             :respect-nl
-
-             ;; respect blank line
-             ;; https://github.com/kkinnear/zprint/blob/main/doc/reference.md#respect-bl
-             :respect-bl
-
-             ;; hang multiline left-hand-thing 
-             ;; https://github.com/kkinnear/zprint/issues/273
-             :multi-lhs-hang]
- :fn-map
- {"reg-sub"         :arg1-pair
-  "h/describe"      :arg1-body
-  "h/test"          :arg1-body
-  "global.describe" :arg1-body
-  "global.test"     :arg1-body
-  "list-comp"       :binding
-  "defview"         :arg1-body
-  "letsubs"         :binding
-  "with-let"        "let"
-  "testing"         :arg1-body
-  "deftest-sub"     :arg1-body
-  "wait-for"        :arg1-body
-  "with-deps-check" :arg1-body
-  "->"              [:noarg1-body
-                     {:list               {:constant-pair? false :force-nl? false}
-                      :next-inner-restore [[:list :constant-pair?]]}]
-  "set!"            "reset!"
-  "assoc-when"      "assoc"
-  "assoc-some"      "assoc"
-  "conj-when"       "conj"
-  "conj-some"       "conj"}
- :remove    {:fn-force-nl #{:noarg1-body}}
- :style-map
- {:no-comma       {:map {:comma? false}}
-  :custom-justify
-  {:doc     "Justify everything using pre-1.1.2 approach"
-   :binding {:justify? true :justify {:max-variance 1000}}
-   :map     {:justify? true :justify {:max-variance 1000}}
-   :pair    {:justify? true :justify {:max-variance 1000}}}}}

ICONS.md

@@ -0,0 +1,28 @@
+# new icons
+
+## Export icons
+
+![](./export-icons.gif)
+
+## android
+1. copy files to corresponding directories at `/Users/romanvolosovskyi/clj/status-react/android/app/src/main/res` (one of `drawable-hdpi`, `drawable-mdpi`, `drawable-xhdpi`, `drawable-xxhdpi`, `drawable-xxxhdpi` for corresponding resolution)
+If you only have 3 pngs 1x, 2x and 3x put them in mdpi, xhdpi and xxhdpi 
+3. if necessary, rename file so that filename contains only lower case chars, and dashes instead of hyphens, e.g. `"Icon-Name.png"` should be renamed to `"icon_name.png"`.
+4. In the app `icon_name.png` still can be accessed as `icon-name`, so in order to use can add the next code:
+    ```clojure
+    ;; icon_name.png
+    [vector-icons/icon :icon-name {:color ...}] 
+    ```
+    
+## ios
+1. open xcode (on macos run `open ios/StatusIm.xcworkspace` from project's root dir)
+2. go to `StatusIm/StatusIm/Images.xcassets` in xcode
+![](https://notes.status.im/uploads/upload_be25e49db97cb114ff4aa0c9d94422fa.png)
+3. add images there
+4.  if necessary, rename file so that filename contains only lower case chars, e.g. `"Icon-Name.png"` should be renamed to `"icon-name"`.
+5.  **IMPORTANT** there is no need to replace hyphens with dashes, and if you do so you will need to use names with dashes in both android and ios versions. So use dashes for android resources names and hyphens for ios.
+6.  And now `"icon-name"` can be added in app the same way as it was added for android version
+    ```clojure
+    ;; icon-name
+    [vector-icons/icon :icon-name {:color ...}] 
+    ```

Makefile

@@ -1,4 +1,4 @@
-.PHONY: nix-add-gcroots clean nix-clean run-metro test release _list _fix-node-perms _tmpdir-rm
+.PHONY: nix-add-gcroots clean nix-clean disable-githooks react-native-android react-native-ios react-native-desktop test release _list _fix-node-perms _tmpdir-mk _tmpdir-rm
 
 help: SHELL := /bin/sh
 help: ##@other Show this help
@@ -14,17 +14,17 @@ WHITE  := $(shell tput -Txterm setaf 7)
 YELLOW := $(shell tput -Txterm setaf 3)
 RESET  := $(shell tput -Txterm sgr0)
 HELP_FUN = \
-			 %help; \
-			 while(<>) { push @{$$help{$$2 // 'options'}}, [$$1, $$3] if /^([a-zA-Z\-]+)\s*:.*\#\#(?:@([a-zA-Z\-]+))?\s(.*)$$/ }; \
-			 print "Usage: make [target]\n\nSee STARTING_GUIDE.md for more info.\n\n"; \
-			 for (sort keys %help) { \
-				 print "${WHITE}$$_:${RESET}\n"; \
-				 for (@{$$help{$$_}}) { \
-					 $$sep = " " x (32 - length $$_->[0]); \
-					 print "  ${YELLOW}$$_->[0]${RESET}$$sep${GREEN}$$_->[1]${RESET}\n"; \
-				 }; \
-				 print "\n"; \
-			 }
+		   %help; \
+		   while(<>) { push @{$$help{$$2 // 'options'}}, [$$1, $$3] if /^([a-zA-Z\-]+)\s*:.*\#\#(?:@([a-zA-Z\-]+))?\s(.*)$$/ }; \
+		   print "Usage: make [target]\n\nSee STARTING_GUIDE.md for more info.\n\n"; \
+		   for (sort keys %help) { \
+			   print "${WHITE}$$_:${RESET}\n"; \
+			   for (@{$$help{$$_}}) { \
+				   $$sep = " " x (32 - length $$_->[0]); \
+				   print "  ${YELLOW}$$_->[0]${RESET}$$sep${GREEN}$$_->[1]${RESET}\n"; \
+			   }; \
+			   print "\n"; \
+		   }
 HOST_OS := $(shell uname | tr '[:upper:]' '[:lower:]')
 
 # This can come from Jenkins
@@ -32,42 +32,45 @@ ifndef BUILD_TAG
 export BUILD_TAG := $(shell git rev-parse --short HEAD)
 endif
 
-# We don't want to use /run/user/$UID because it runs out of space too easilly.
-export TMPDIR = /tmp/tmp-status-mobile-$(BUILD_TAG)
-# This has to be specified for both the Node.JS server process and the Qt process.
+# We don't want to use /run/user/$UID because it runs out of space too easilly
+export TMPDIR = /tmp/tmp-status-react-$(BUILD_TAG)
+# this has to be specified for both the Node.JS server process and the Qt process
 export REACT_SERVER_PORT ?= 5001
-# Fix for ERR_OSSL_EVP_UNSUPPORTED error.
-export NODE_OPTIONS += --openssl-legacy-provider
-# The path can be anything, but home is usually safest.
-export KEYSTORE_PATH ?= $(HOME)/.gradle/status-im.keystore
 
 # Our custom config is located in nix/nix.conf
-export NIX_USER_CONF_FILES = $(PWD)/nix/nix.conf
-# Location of symlinks to derivations that should not be garbage collected
-export _NIX_GCROOTS = /nix/var/nix/gcroots/per-user/$(USER)/status-mobile
+export NIX_CONF_DIR = $(PWD)/nix
 # Defines which variables will be kept for Nix pure shell, use semicolon as divider
-export _NIX_KEEP ?= TMPDIR,BUILD_ENV,\
-	BUILD_TYPE,BUILD_NUMBER,COMMIT_HASH,\
-	ANDROID_GRADLE_OPTS,ANDROID_ABI_SPLIT,ANDROID_ABI_INCLUDE,\
-	STATUS_GO_SRC_OVERRIDE,STATUS_GO_IPFS_GATEWAY_URL
+export _NIX_KEEP ?= TMPDIR,BUILD_ENV,STATUS_GO_SRC_OVERRIDE,NIMBUS_SRC_OVERRIDE
+export _NIX_ROOT = /nix
+# legacy TARGET_OS variable support
+ifdef TARGET_OS
+export TARGET ?= $(TARGET_OS)
+endif
 
-# Useful for Android release builds
+# Useful for checking if we are on NixOS
+OS_NAME := $(shell [ -f /etc/os-release ] && awk -F= '/^NAME/{print $2}' /etc/os-release)
+
+# Useful for Andoird release builds
 TMP_BUILD_NUMBER := $(shell ./scripts/version/gen_build_no.sh | cut -c1-10)
 
 # MacOS root is read-only, read nix/README.md for details
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Darwin)
 export NIX_IGNORE_SYMLINK_STORE=1
+export _NIX_ROOT = /opt/nix
 endif
 
 #----------------
 # Nix targets
 #----------------
 
-# WARNING: This has to be located right before all the targets.
+# WARNING: This has to be located right before the targets
+ifdef IN_NIX_SHELL
+SHELL := env bash
+else
 SHELL := ./nix/scripts/shell.sh
+endif
 
-shell: export TARGET ?= default
 shell: ##@prepare Enter into a pre-configured shell
 ifndef IN_NIX_SHELL
 	@ENTER_NIX_SHELL
@@ -75,40 +78,32 @@ else
 	@echo "${YELLOW}Nix shell is already active$(RESET)"
 endif
 
-nix-repl: SHELL := /bin/sh
-nix-repl: ##@nix Start an interactive Nix REPL
-	nix repl default.nix
+nix-gc: ##@nix Garbage collect all packages older than 20 days from /nix/store
+	nix-collect-garbage --delete-old --delete-older-than 20d
 
-nix-gc-protected: SHELL := /bin/sh
-nix-gc-protected:
-	@echo -e "$(YELLOW)The following paths are protected:$(RESET)" && \
-	ls -1 $(_NIX_GCROOTS) | sed 's/^/ - /'
-
-nix-upgrade: SHELL := /bin/sh
-nix-upgrade: ##@nix Upgrade Nix interpreter to current version.
-	nix/scripts/upgrade.sh
-
-nix-gc: export TARGET := nix
-nix-gc: nix-gc-protected ##@nix Garbage collect all packages older than 20 days from /nix/store
-	nix-store --gc
-
-nix-clean: export TARGET := default
-nix-clean: ##@nix Remove all status-mobile build artifacts from /nix/store
+nix-clean: ##@nix Remove all status-react build artifacts from /nix/store
 	nix/scripts/clean.sh
 
 nix-purge: SHELL := /bin/sh
-nix-purge: ##@nix Completely remove Nix setup, including /nix directory
-	nix/scripts/purge.sh
+nix-purge: ##@nix Completely remove the complete Nix setup
+ifeq ($(OS_NAME), NixOS)
+	$(error $(RED)You should not purge Nix files on NixOS!$(RESET))
+else
+	sudo rm -rf $(_NIX_ROOT)/* ~/.nix-profile ~/.nix-defexpr ~/.nix-channels ~/.cache/nix ~/.status .nix-gcroots
+endif
+
+nix-add-gcroots: export TARGET := default
+nix-add-gcroots: ##@nix Add Nix GC roots to avoid status-react expressions being garbage collected
+	nix/scripts/gcroots.sh
 
-nix-update-gradle: export TARGET := gradle
 nix-update-gradle: ##@nix Update maven nix expressions based on current gradle setup
-	nix/deps/gradle/generate.sh
+	nix/mobile/android/maven-and-npm-deps/maven/generate-nix.sh
 
-nix-update-clojure: export TARGET := clojure
-nix-update-clojure: ##@nix Update maven Nix expressions based on current clojure setup
-	nix/deps/clojure/generate.sh
+nix-update-lein: export TARGET := lein
+nix-update-lein: ##@nix Update maven nix expressions based on current lein setup
+	nix/tools/lein/generate-nix.sh nix/lein
 
-nix-update-gems: export TARGET := default
+nix-update-gems: export TARGET := lein
 nix-update-gems: ##@nix Update Ruby gems in fastlane/Gemfile.lock and fastlane/gemset.nix
 	fastlane/update.sh
 
@@ -125,36 +120,31 @@ _fix-node-perms: ##@prepare Fix permissions so that directory can be cleaned
 	$(shell test -d node_modules && chmod -R 744 node_modules)
 	$(shell test -d node_modules.tmp && chmod -R 744 node_modules.tmp)
 
-$(TMPDIR): SHELL := /bin/sh
-$(TMPDIR): ##@prepare Create a TMPDIR for temporary files
+_tmpdir-mk: SHELL := /bin/sh
+_tmpdir-mk: ##@prepare Create a TMPDIR for temporary files
 	@mkdir -p "$(TMPDIR)"
 # Make sure TMPDIR exists every time make is called
-_tmpdir-mk: $(TMPDIR)
 -include _tmpdir-mk
 
 _tmpdir-rm: SHELL := /bin/sh
 _tmpdir-rm: ##@prepare Remove TMPDIR
 	rm -fr "$(TMPDIR)"
 
-_install-hooks: SHELL := /bin/sh
-_install-hooks: ##@prepare Create prepare-commit-msg git hook symlink
-	@ln -s -f ../../scripts/hooks/prepare-commit-msg .git/hooks
--include _install-hooks
-
-# Remove directories and ignored files
 clean: SHELL := /bin/sh
 clean: _fix-node-perms _tmpdir-rm ##@prepare Remove all output folders
-	git clean -dXf
-
-# Remove directories, ignored and non-ignored files
-purge: SHELL := /bin/sh
-purge: _fix-node-perms _tmpdir-rm ##@prepare Remove all output folders
 	git clean -dxf
 
-
 watchman-clean: export TARGET := watchman
 watchman-clean: ##@prepare Delete repo directory from watchman
-	watchman watch-del $${STATUS_MOBILE_HOME}
+	watchman watch-del $${STATUS_REACT_HOME}
+
+disable-githooks: SHELL := /bin/sh
+disable-githooks: ##@prepare Disables lein githooks
+	@rm -f ${env.WORKSPACE}/.git/hooks/pre-commit && \
+	sed -i'~' -e 's|\[rasom/lein-githooks|;; [rasom/lein-githooks|' \
+		-e 's|:githooks|;; :githooks|' \
+		-e 's|:pre-commit|;; :pre-commit|' project.clj; \
+	rm project.clj~
 
 pod-install: export TARGET := ios
 pod-install: ##@prepare Run 'pod install' to install podfiles and update Podfile.lock
@@ -162,120 +152,127 @@ pod-install: ##@prepare Run 'pod install' to install podfiles and update Podfile
 
 update-fleets: ##@prepare Download up-to-date JSON file with current fleets state
 	curl -s https://fleets.status.im/ \
-		| sed 's/"warning": "/"warning": "DO NOT EDIT! /' \
+		| jq --indent 4 --sort-keys . \
 		> resources/config/fleets.json
 
-$(KEYSTORE_PATH): export TARGET := keytool
-$(KEYSTORE_PATH):
+keystore: export TARGET := keytool
+keystore: export KEYSTORE_PATH ?= $(HOME)/.gradle/status-im.keystore
+keystore: ##@prepare Generate a Keystore for signing Android APKs
 	@./scripts/generate-keystore.sh
 
-keystore: $(KEYSTORE_PATH) ##@prepare Generate a Keystore for signing Android APKs
-
-fdroid-max-watches: SHELL := /bin/sh
-fdroid-max-watches: ##@prepare Bump max_user_watches to avoid ENOSPC errors
-	sysctl fs.inotify.max_user_watches=524288
-
-fdroid-nix-dir: SHELL := /bin/sh
-fdroid-nix-dir: ##@prepare Create /nix directory for F-Droid Vagrant builders
-	mkdir -m 0755 /nix
-	chown vagrant /nix
-
-fdroid-fix-tmp: SHELL := /bin/sh
-fdroid-fix-tmp: ##@prepare Fix TMPDIR permissions so Vagrant user is the owner
-	chown -R vagrant "$(TMPDIR)"
-
-fdroid-build-env: fdroid-max-watches fdroid-nix-dir fdroid-fix-tmp ##@prepare Setup build environment for F-Droud build
-
-fdroid-pr: export TARGET := android-sdk
-fdroid-pr: ##@prepare Create F-Droid release PR
-ifndef APK
-	$(error APK env var not defined)
-endif
-	scripts/fdroid-pr.sh "$(APK)"
-
-xcode-clean: SHELL := /bin/sh
-xcode-clean: XCODE_HOME := $(HOME)/Library/Developer/Xcode
-xcode-clean: ##@prepare Clean XCode derived data and archives
-	rm -fr $(XCODE_HOME)/DerivedData/StatusIm-* $(XCODE_HOME)/Archives/*/StatusIm*
-
 #----------------
 # Release builds
 #----------------
-release: release-android release-ios ##@build Build release for Android and iOS
+release: release-android release-ios ##@build build release for Android and iOS
 
-build-fdroid: export BUILD_ENV = prod
-build-fdroid: export BUILD_TYPE = release
-build-fdroid: export ANDROID_ABI_SPLIT = false
-build-fdroid: export ANDROID_ABI_INCLUDE = armeabi-v7a;arm64-v8a;x86;x86_64
-build-fdroid: ##@build Build release for F-Droid
-	@scripts/build-android.sh
-
-build-android: export BUILD_ENV ?= prod
-build-android: export BUILD_TYPE ?= nightly
-build-android: export BUILD_NUMBER ?= $(TMP_BUILD_NUMBER)
-build-android: export ANDROID_ABI_SPLIT ?= false
-build-android: export ANDROID_ABI_INCLUDE ?= armeabi-v7a;arm64-v8a;x86
-build-android: ##@build Build unsigned Android APK
-	@scripts/build-android.sh
-
-release-android: export TARGET := keytool
+release-android: export TARGET := android
+release-android: export BUILD_ENV ?= prod
+release-android: export BUILD_TYPE ?= nightly
+release-android: export BUILD_NUMBER ?= $(TMP_BUILD_NUMBER)
 release-android: export KEYSTORE_PATH ?= $(HOME)/.gradle/status-im.keystore
-release-android: keystore build-android ##@build Build signed Android APK
-	@scripts/sign-android.sh result/app-release-unsigned.apk
+release-android: export ANDROID_ABI_SPLIT ?= false
+release-android: export ANDROID_ABI_INCLUDE ?= armeabi-v7a;arm64-v8a;x86
+release-android: keystore ##@build build release for Android
+	scripts/release-android.sh
 
-release-ios: export TARGET := ios
+release-ios: export TARGET ?= ios
 release-ios: export BUILD_ENV ?= prod
-release-ios: watchman-clean ios-clean jsbundle ##@build Build release for iOS release
-	xcodebuild \
-		-scheme StatusIm \
-		-configuration Release \
-		-workspace ios/StatusIm.xcworkspace \
-		-destination 'generic/platform=iOS' \
-		-UseModernBuildSystem=N clean archive
+release-ios: watchman-clean ##@build build release for iOS release
+	@git clean -dxf -f target/ios && \
+	$(MAKE) jsbundle-ios && \
+	scripts/copy-translations.sh && \
+	xcodebuild -workspace ios/StatusIm.xcworkspace -scheme StatusIm -configuration Release -destination 'generic/platform=iOS' -UseModernBuildSystem=N clean archive
 
-jsbundle: SHELL := /bin/sh
-jsbundle: export BUILD_ENV ?= prod
-jsbundle: ##@build Build JavaScript and Clojurescript bundle for iOS and Android
-	nix/scripts/build.sh targets.mobile.jsbundle
+release-desktop: export TARGET ?= $(HOST_OS)
+release-desktop: ##@build build release for desktop release based on TARGET
+	@$(MAKE) jsbundle-desktop && \
+	scripts/copy-translations.sh && \
+	scripts/build-desktop.sh; \
+	$(MAKE) watchman-clean
+
+release-windows-desktop: export TARGET ?= windows
+release-windows-desktop: ##@build build release for windows desktop release
+	@$(MAKE) jsbundle-desktop && \
+	scripts/copy-translations.sh && \
+	scripts/build-desktop.sh; \
+	$(MAKE) watchman-clean
+
+prod-build-android: jsbundle-android ##@legacy temporary legacy alias for jsbundle-android
+	@echo "${YELLOW}This a deprecated target name, use jsbundle-android.$(RESET)"
+
+jsbundle-android: SHELL := /bin/sh
+jsbundle-android: export TARGET ?= android
+jsbundle-android: export BUILD_ENV ?= prod
+jsbundle-android: ##@jsbundle Compile JavaScript and Clojure into index.android.js
+	# Call nix-build to build the 'targets.mobile.android.jsbundle' attribute and copy the index.android.js file to the project root
+	@git clean -dxf ./index.$(TARGET).js
+	nix/scripts/build.sh targets.mobile.android.jsbundle && \
+	mv result/index.$(TARGET).js ./
+
+prod-build-ios: jsbundle-ios ##@legacy temporary legacy alias for jsbundle-ios
+	@echo "${YELLOW}This a deprecated target name, use jsbundle-ios.$(RESET)"
+
+jsbundle-ios: export TARGET ?= ios
+jsbundle-ios: export BUILD_ENV ?= prod
+jsbundle-ios: ##@jsbundle Compile JavaScript and Clojure into index.ios.js
+	@git clean -dxf -f ./index.$(TARGET).js && \
+	lein jsbundle-ios && \
+	node prepare-modules.js
+
+prod-build-desktop: jsbundle-desktop ##@legacy temporary legacy alias for jsbundle-desktop
+	@echo "${YELLOW}This a deprecated target name, use jsbundle-desktop.$(RESET)"
+
+jsbundle-desktop: export TARGET ?= $(HOST_OS)
+jsbundle-desktop: export BUILD_ENV ?= prod
+jsbundle-desktop: ##@jsbundle Compile JavaScript and Clojure into index.desktop.js
+	git clean -qdxf -f ./index.desktop.js desktop/ && \
+	lein jsbundle-desktop && \
+	node prepare-modules.js
 
 #--------------
-# status-go lib
-#--------------
+# Clojure REPL
+# -------------
 
-status-go-android: SHELL := /bin/sh
-status-go-android: ##@status-go Compile status-go for Android app
-	nix/scripts/build.sh targets.status-go.mobile.android
+_watch-%: ##@watch Start development for device
+	$(eval SYSTEM := $(word 2, $(subst -, , $@)))
+	$(eval DEVICE := $(word 3, $(subst -, , $@)))
+	clj -R:dev build.clj watch --platform $(SYSTEM) --$(SYSTEM)-device $(DEVICE)
 
-status-go-ios: SHELL := /bin/sh
-status-go-ios: ##@status-go Compile status-go for iOS app
-	nix/scripts/build.sh targets.status-go.mobile.ios
+watch-ios-real: export TARGET := ios
+watch-ios-real: _watch-ios-real
+watch-ios-simulator: export TARGET := ios
+watch-ios-simulator: _watch-ios-simulator
+watch-android-real: export TARGET := android
+watch-android-real: _watch-android-real
+watch-android-avd: export TARGET := android
+watch-android-avd: _watch-android-avd
+watch-android-genymotion: export TARGET ?= android
+watch-android-genymotion: _watch-android-genymotion
 
-status-go-library: SHELL := /bin/sh
-status-go-library: ##@status-go Compile status-go for node-js
-	nix/scripts/build.sh targets.status-go.library
+watch-desktop: export TARGET ?= $(HOST_OS)
+watch-desktop:
+	clj -R:dev build.clj watch --platform desktop
+
+desktop-server: export TARGET ?= $(HOST_OS)
+desktop-server:
+	node ubuntu-server.js
 
 #--------------
-# Watch, Build & Review changes
+# Run React-Native app
 #--------------
-
-run-clojure: export TARGET := clojure
-run-clojure: ##@run Watch for and build Clojure changes for mobile
-	yarn shadow-cljs watch mobile
-
-run-metro: export TARGET := clojure
-run-metro: ##@run Start Metro to build React Native changes
-	@scripts/start-react-native.sh
-
-run-re-frisk: export TARGET := clojure
-run-re-frisk: ##@run Start re-frisk server
-	yarn shadow-cljs run re-frisk-remote.core/start
+_run-%:
+	$(eval SYSTEM := $(word 2, $(subst -, , $@)))
+	npx react-native run-$(SYSTEM)
 
 # TODO: Migrate this to a Nix recipe, much the same way as nix/mobile/android/targets/release-android.nix
 run-android: export TARGET := android
 run-android: ##@run Build Android APK and start it on the device
 	npx react-native run-android --appIdSuffix debug
 
-SIMULATOR=iPhone 11 Pro
+run-desktop: export TARGET ?= $(HOST_OS)
+run-desktop: _run-desktop ##@run Run Desktop build
+
+SIMULATOR=
 run-ios: export TARGET := ios
 run-ios: ##@run Build iOS app and start it in a simulator/device
 ifneq ("$(SIMULATOR)", "")
@@ -284,132 +281,111 @@ else
 	npx react-native run-ios
 endif
 
-show-ios-devices: export TARGET := ios
-show-ios-devices: ##@other shows connected ios device and its name
-	xcrun xctrace list devices
-
-run-ios-device: export TARGET := ios
-run-ios-device: ##@run iOS app and start it on a connected device by its name
-ifndef DEVICE_NAME
-	$(error Usage: make run-ios-device DEVICE_NAME=your-device-name)
-endif
-	react-native run-ios --device "$(DEVICE_NAME)"
-
 #--------------
 # Tests
 #--------------
 
-# Get all clojure files, including untracked, excluding removed
-define find_all_clojure_files
-$$(comm -23 <(sort <(git ls-files --cached --others --exclude-standard)) <(sort <(git ls-files --deleted)) | grep -e \.clj$$ -e \.cljs$$ -e \.cljc$$ -e \.edn)
-endef
-
-lint: export TARGET := clojure
+lint: export TARGET := lein
 lint: ##@test Run code style checks
-	@sh scripts/lint-re-frame-in-quo-components.sh && \
-	clj-kondo --config .clj-kondo/config.edn --cache false --lint src && \
-	ALL_CLOJURE_FILES=$(call find_all_clojure_files) && \
-	zprint '{:search-config? true}' -sfc $$ALL_CLOJURE_FILES && \
-	sh scripts/lint-trailing-newline.sh && \
-	yarn prettier
+	lein cljfmt check
 
-# NOTE: We run the linter twice because of https://github.com/kkinnear/zprint/issues/271
-lint-fix: export TARGET := clojure
+lint-fix: export TARGET := lein
 lint-fix: ##@test Run code style checks and fix issues
-	ALL_CLOJURE_FILES=$(call find_all_clojure_files) && \
-	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \
-	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \
-	sh scripts/lint-trailing-newline.sh --fix && \
-	yarn prettier
+	lein cljfmt fix
 
-shadow-server: export TARGET := clojure
-shadow-server:##@ Start shadow-cljs in server mode for watching
-	yarn shadow-cljs server
-
-test-watch: export TARGET := clojure
-test-watch: ##@ Watch tests and re-run no changes to cljs files
-	yarn install
-	nodemon --exec 'yarn shadow-cljs compile mocks && yarn shadow-cljs compile test && node --require ./test-resources/override.js target/test/test.js' -e cljs
-
-test-watch-for-repl: export TARGET := clojure
-test-watch-for-repl: ##@ Watch tests and support REPL connections
-	yarn install
-	rm -f target/test/test.js
-	concurrently --kill-others --prefix-colors 'auto' --names 'build,repl' \
-		'yarn shadow-cljs compile mocks && yarn shadow-cljs watch test --verbose' \
-		'until [ -f ./target/test/test.js ] ; do sleep 1 ; done ; node --require ./test-resources/override.js ./target/test/test.js --repl'
-
-test: export TARGET := clojure
+test: export TARGET := lein
 test: ##@test Run tests once in NodeJS
-	# Here we create the gyp bindings for nodejs
-	yarn install
-	yarn shadow-cljs compile mocks && \
-	yarn shadow-cljs compile test && \
-	node --require ./test-resources/override.js target/test/test.js
+	lein with-profile test doo node test once
 
-component-test-watch: export TARGET := clojure
-component-test-watch: export COMPONENT_TEST := true
-component-test-watch: export BABEL_ENV := test
-component-test-watch: ##@ Watch tests and re-run no changes to cljs files
-	yarn install
-	nodemon --exec 'yarn shadow-cljs compile component-test && jest --config=test/jest/jest.config.js' -e cljs
+test-auto: export TARGET := lein
+test-auto: ##@test Run tests in interactive (auto) mode in NodeJS
+	lein with-profile test doo node test
 
-component-test: export TARGET := clojure
-component-test: export COMPONENT_TEST := true
-component-test: export BABEL_ENV := test
-component-test: ##@test Run component tests once in NodeJS
-	yarn install
-	yarn shadow-cljs compile component-test && \
-	jest --config=test/jest/jest.config.js
+coverage: ##@test Run tests once in NodeJS generating coverage
+	@scripts/run-coverage.sh
 
 #--------------
 # Other
 #--------------
+react-native-desktop: export TARGET ?= $(HOST_OS)
+react-native-desktop: export _NIX_PURE ?= true
+react-native-desktop: ##@other Start react native packager
+	@scripts/start-react-native.sh
 
-geth-connect: export TARGET := android-sdk
+react-native-android: export TARGET := android
+react-native-android: export _NIX_PURE ?= true
+react-native-android: ##@other Start react native packager for Android client
+	@scripts/start-react-native.sh
+
+react-native-ios: export TARGET := ios
+react-native-ios: export _NIX_PURE ?= true
+react-native-ios: ##@other Start react native packager for Android client
+	@scripts/start-react-native.sh
+
+geth-connect: export TARGET := android-env
 geth-connect: ##@other Connect to Geth on the device
 	adb forward tcp:8545 tcp:8545 && \
 	build/bin/geth attach http://localhost:8545
 
-ios-clean: SHELL := /bin/sh
-ios-clean: ##@prepare Clean iOS build artifacts
-	git clean -dxf -f target/ios
-
-android-clean: export TARGET := gradle
 android-clean: ##@prepare Clean Gradle state
-	git clean -dxf -f ./android/app/build; \
-	[[ -d android/.gradle ]] && cd android && ./gradlew clean
+	git clean -dxf -f ./android/app/build
+	[ -d android/.gradle ] && cd android && ./gradlew clean
 
-android-ports: export TARGET := android-sdk
+android-ports: export TARGET := android-env
 android-ports: ##@other Add proxies to Android Device/Simulator
 	adb reverse tcp:8081 tcp:8081 && \
 	adb reverse tcp:3449 tcp:3449 && \
 	adb reverse tcp:4567 tcp:4567 && \
 	adb forward tcp:5561 tcp:5561
 
-android-devices: export TARGET := android-sdk
+android-devices: export TARGET := android-env
 android-devices: ##@other Invoke adb devices
 	adb devices
 
-android-logcat: export TARGET := android-sdk
-android-logcat: ##@other Read status-mobile logs from Android phone using adb
+android-logcat: export TARGET := android-env
+android-logcat: ##@other Read status-react logs from Android phone using adb
 	adb logcat | grep -e RNBootstrap -e ReactNativeJS -e ReactNative -e StatusModule -e StatusNativeLogs -e 'F DEBUG   :' -e 'Go      :' -e 'GoLog   :' -e 'libc    :'
 
-android-install: export TARGET := android-sdk
+android-install: export TARGET := android-env
 android-install: export BUILD_TYPE ?= release
-android-install: ##@other Install APK on device using adb
+android-install:
 	adb install result/app-$(BUILD_TYPE).apk
 
 _list: SHELL := /bin/sh
 _list:
 	@$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | egrep -v -e '^[^[:alnum:]]' -e '^$@$$'
 
-#--------------
-# REPLs
-#--------------
+_unknown-startdev-target-%: SHELL := /bin/sh
+_unknown-startdev-target-%:
+	@ echo "Unknown target device '$*'. Supported targets:"; \
+	${MAKE} _list | grep "watch-" | sed s/watch-/startdev-/; \
+	exit 1
 
-repl-clojure: export TARGET := clojure
-repl-clojure: ##@repl Start Clojure repl for mobile App
-	yarn shadow-cljs cljs-repl mobile
+_startdev-%: SHELL := /bin/sh
+_startdev-%:
+	$(eval SYSTEM := $(word 2, $(subst -, , $@)))
+	$(eval DEVICE := $(word 3, $(subst -, , $@)))
+	@ if [ -z "$(DEVICE)" ]; then \
+		$(MAKE) watch-$(SYSTEM) || $(MAKE) _unknown-startdev-target-$@; \
+	else \
+		$(MAKE) watch-$(SYSTEM)-$(DEVICE) || $(MAKE) _unknown-startdev-target-$@; \
+	fi
 
-repl-nix: nix-repl ##@repl Start an interactive Nix REPL
+startdev-android-avd: export TARGET = android
+startdev-android-avd: _startdev-android-avd
+startdev-android-avd:  ##@startdev Compile Clojure for Android AVD
+startdev-android-genymotion: export TARGET = android
+startdev-android-genymotion: _startdev-android-genymotion
+startdev-android-genymotion: ##@startdev Compile Clojure for Genymotion
+startdev-android-real: export TARGET = android
+startdev-android-real: _startdev-android-real
+startdev-android-real: ##@startdev Compile Clojure for Android real device
+startdev-ios-real: export TARGET = ios
+startdev-ios-real: _startdev-ios-real
+startdev-ios-real: ##@startdev Compile Clojure for iOS device
+startdev-ios-simulator: export TARGET = ios
+startdev-ios-simulator: _startdev-ios-simulator
+startdev-ios-simulator: ##@startdev Compile Clojure for iOS simulator
+
+startdev-desktop: export TARGET ?= $(HOST_OS)
+startdev-desktop: _startdev-desktop

README.md

@@ -1,62 +1,52 @@
+
 # Status - a Mobile Ethereum Operating System
 
-[<img src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" alt="Get it on Google Play" height="80"/>](https://play.google.com/store/apps/details?id=im.status.ethereum)
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="80"/>](https://f-droid.org/packages/im.status.ethereum/)
-
-
-[Get it on Github](https://github.com/status-im/status-mobile/releases)
-
 Join us in creating a browser, messenger, and gateway to a decentralized world. Status is a free (libre) open source mobile client targeting Android & iOS built entirely on [Ethereum](https://ethereum.org/) technologies. That's right, no middle men and `go-ethereum` running directly on your device.
 
 [![Getting started with Status](https://i.imgur.com/C0aZZEL.jpg)](https://www.youtube.com/watch?v=oDCSEmS9c3o "Getting started with Status")
 
 ## Why?
 
-We believe in a medium of pure free trade, economies with fair, permission-less access and a world without intermediaries. We want to create policies that can exist between friends or scale globally, we want to communicate securely and be uninhibited by legacy systems.
+We believe in a medium of pure free trade, economies with fair, permission-less access and a world without intermediaries. We want to create policies that can exist between friends or scale globally, we want to communicate securely and be uninhibited by legacy systems.   
 
 We want to take responsibility for our data, the way we conduct ourselves privately and promote this way of life to a mass audience.
 
-We want deep insights into our own economies so we can make informed, data-driven decisions on how to make our lives better. The Ethereum blockchain, Smart Contracts, Swarm and Whisper provides us a path forward.
+We want deep insights into our own economies so we can make informed, data-driven decisions on how to make our lives better. The Ethereum blockchain, Smart Contracts, Swarm and Whisper provides us a path forward.  
 
 If this interests you, **help us make Status a reality** - anyone can contribute and we need everyone at any skill level to participate.
 
 ## How to Contribute?
 
-Go straight to the [docs](doc/) and choose what interests you:
+Go straight to the [docs](https://status.im/docs) or [join our chat](https://join.status.im/chat/public/status) and choose what interests you:
 
-- **Developer** Developers are the heart of software and to keep Status beating
-we need all the help we can get! If you're looking to code in ClojureScript or
-Golang then Status is the project for you! We use React Native and there is even
-some Java/Objective-C too! Want to learn more about it? Start by reading our
-[Developer Introduction](doc/starting-guide.md) which guides you
-through the technology stack and start browsing [beginner
-issues](https://github.com/status-im/status-mobile/issues?utf8=%E2%9C%93&q=is%3Aopen%20is%3Aissue%20label%3A%22good%20first%20issue%22%20).
-Then you can read how to [Build
-Status](doc/starting-guide.md), which talks about managing
-project dependencies, coding guidelines and testing procedures.
-Check out our [coding guidelines](doc/new-guidelines.md).
+- **Developer**
+Developers are the heart of software and to keep Status beating we need all the help we can get! If you're looking to code in ClojureScript or Golang then Status is the project for you! We use React Native and there is even some Java/Objective-C too!  
+Want to learn more about it? Start by reading our [Developer Introduction](https://status.im/developer_tools/) which guides you through the technology stack and start browsing [beginner issues](https://github.com/status-im/status-react/issues?utf8=%E2%9C%93&q=is%3Aopen%20is%3Aissue%20label%3A%22good%20first%20issue%22%20). Then you can read how to [Build Status](https://status.im/build_status/), which talks about managing project dependencies, coding guidelines and testing procedures.
 
-- **Community Management**
-Metcalfe's law states that the value of a network is proportional to the square of the number of connected users of the system - without community Status is meaningless. We're looking to create a positive, fun environment to explore new ideas, experiment and grow the Status community. Building a community takes a lot of work but the people you'll meet and long lasting relationships you form will be well worth it, check out our [Mission and Community Principles](https://status.im/about)
+- **Community Management**  
+Metcalfe's law states that the value of a network is proportional to the square of the number of connected users of the system - without community Status is meaningless. We're looking to create a positive, fun environment to explore new ideas, experiment and grow the Status community. Building a community takes a lot of work but the people you'll meet and long lasting relationships you form will be well worth it, check out our [Community Principles](https://status.im/contribute/our_principles.html)
 
-- **Specification / Documentation**
-John Dewey once said "Education is not preparation for life; education is life *itself* ". Developers & Designers need guidance and it all starts from documentation and specifications. Our software is only as good as its documentation, check out our [docs](doc/) and see how you can improve what we have.
+- **Specification / Documentation**  
+John Dewey once said "Education is not preparation for life; education is life *itself* ". Developers & Designers need guidance and it all starts from documentation and specifications. Our software is only as good as its documentation, head over to our [docs](https://status.im/docs) and see how you can improve what we have.
 
-- **Blog Writing**
-Content is King, keeping our blog up to date and informing the community of news helps keep everyone on the same page.
+- **Blog Writing**  
+Content is King, keeping our blog up to date and informing the community of news helps keep everyone on the same page. [Jump into our chat](https://join.status.im/chat/public/status) and discuss with the team how you can contribute!
 
-- **Testers**
-It's bug hunting season! Status is currently under active development and there is sure to be a bunch of learning, [build status from scratch](doc/starting-guide.md) or if an android user check out our [nightly builds](https://status.im/nightly). You can shake your phone to submit bug reports, or start browsing our [Github Issues](https://github.com/status-im/status-mobile/issues). Every bug you find brings Status closer to stable, usable software for everyone to enjoy!
+- **Testers**  
+It's bug hunting season! Status is currently in Alpha and there is sure to be a bunch of learning, [build status from scratch](https://status.im/build_status/) or if an android user check out our [nightly builds](https://status.im/nightly). You can shake your phone to submit bug reports, or start browsing our [Github Issues](https://github.com/status-im/status-react/issues). Every bug you find brings Status closer to stable, usable software for everyone to enjoy!
 
-- **Security**
+- **Security**  
 Status is a visual interface to make permanent changes on the Blockchain, it handles crypto-tokens that have real value and allows 3rd party code execution. Security is paramount to its success. You are given permission to break Status as hard as you can, as long as you share your findings with the community!
 
-- **Evangelism**
+- **Evangelism**  
 Help us spread the word! Tell a friend *right now*, in fact tell **everyone** - yell from a mountain if you have to, every person counts! If you've got a great story to tell or have some interesting way you've spread the word about Status let us know about it in our [chat](https://join.status.im/chat/public/status)
 
+## Status API 
+View our [API Docs](https://status.im/developer_tools/status_web_api.html) and learn how to integrate your DApp into Status. You can read more about how to add your DApp to Status [here](https://status.im/developer_tools/add_your_dapp.html).
+
 ## Give me Binaries!
 
-You can get our Beta builds for both Android and iOS on our [website](https://status.im), through our [nightly builds](https://status.im/nightly/) or by [building it yourself](https://status.im/technical/build_status/).
+You can get our Beta builds for both Android and iOS on our [website](https://status.im), through our [nightly builds](https://status.im/nightly/) or by [building it yourself](https://status.im/build_status/).
 
 ## Core Contributors
 
@@ -67,8 +57,14 @@ Without the dedication of these outstanding individuals, Status would not exist.
 
 ## Contact us
 
-Feel free to email us at [support@status.im](mailto:support@status.im).
+Feel free to email us at [support@status.im](mailto:support@status.im) or better yet, [join our chat](https://join.status.im/chat/public/status).
 
 ## License
 
-Licensed under the [Mozilla Public License v2.0](https://github.com/status-im/status-mobile/blob/develop/LICENSE.md)
+Licensed under the [Mozilla Public License v2.0](https://github.com/status-im/status-react/blob/develop/LICENSE.md)
+
+## Testing Supported by
+
+[![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=SFBWQ3k5R2tnT2t6UGsxU1h1U0g3VFlCNnoxVTRHYWNoTDhsb1laaTJZWT0tLUZMUm5sSVFBSU9qSWM1RUJvK1I3Z3c9PQ==--ad15ae7992b432b33743749d40318952415bd98f)](https://www.browserstack.com/automate/public-build/SFBWQ3k5R2tnT2t6UGsxU1h1U0g3VFlCNnoxVTRHYWNoTDhsb1laaTJZWT0tLUZMUm5sSVFBSU9qSWM1RUJvK1I3Z3c9PQ==--ad15ae7992b432b33743749d40318952415bd98f)
+
+[![Coverage Status](https://coveralls.io/repos/github/status-im/status-react/badge.svg?)](https://coveralls.io/github/status-im/status-react)

REVIEW.md

@@ -0,0 +1,42 @@
+This document MUST be updated everytime a PR has been identified has the source of a bug in develop. The post mortem analysis MUST include: the CAUSE of the bug, the RESOLUTION PROCESS and PREVENTION MEASURES.
+
+
+# "sql: no rows in result set" error on iOS login
+
+## Cause
+
+There were errors in the iOS native code:
+- "loginWithKeycard" method was not implemented
+- "createAndLoginWithKeycard" method was actually used instead of "createAndLogin** which is used for regular account creation without keycard and doesn't have the same final argument
+
+QA process was focused on account creation and login with keycard, and this bug would only appear specifically on iOS when creating an account without keycard and only during the next login. It was therefore a more complex path to reach than what could have been expected from this PR, and it was caused in develop by a developer working on iOS simulator because that is a common path during development.
+
+## Resolution process
+
+- the commit was reverted locally by the developer which fixed the issue localy and confirmed the faulty commit
+- the bug was only reproducible on iOS which strongly hinted at a potential issue with native code
+- the missing method was not the origin of the problem but was found at this point and further analysis lead to the shadowing error
+
+## Prevention measures
+
+- PRs that change native code should be checked for platform parity:
+  - same methods are created/modified for each platform
+  - test cases in the PR should take these methods in consideration
+
+# Missing labels for en translation
+
+https://github.com/status-im/status-react/issues/9003
+
+## Cause
+
+Unused labels in the application have been listed by QA and an issue created for their removal. The PR was made by an external contributor and it had to be rebased many time because it touched many files and other PRs got merged before this one could be tested. After a last rebase the PR was merged with 100% e2e test but no manual testing.
+
+The reason some translations got deleted despite the fact that they were used is because the `message status` related labels were not explicitly mentioned in the code unlike every other labels. They were built from the actual `message status` and the prefix `status-`.
+
+## Resolution process
+
+The mistake was quickly noticed in develop and an issue created. The fix was to recover the 3 labels that were accidentally deleted. 
+
+## Prevention measures
+
+The code has been changed so that the labels are no longer generated and appear in the code like other labels.

STARTING_GUIDE.md

@@ -0,0 +1,61 @@
+# Description
+
+This document provides information on how to start developing Status App.
+
+# Getting Started
+
+To start developing start a shell for platform you are interested in.
+```
+make shell TARGET=android
+```
+This step will take a while the first time as it will download all dependencies.
+
+To build the app, your can simply run on of the following:
+```
+make release-android
+make release-ios
+```
+For more `make` targets run `make help`.
+
+# Development
+
+There are three steps necessary to start development, in this case for Android:
+
+1. `make startdev-android-real` - Compiles Clojure into JavaScript for real device
+2. `make react-native-android` - Watches JavaScript code and updates the App
+3. `make run-android` - Builds the Android app and starts it on the device
+
+The first two will continue watching for changes and keep re-building the app.
+The last one will exit once the app is up and ready.
+
+# Manual Steps
+
+There are a few manual steps you might want to do in order to start contributing.
+
+## Genymotion Virtualization
+
+Optionally set up Genymotion if you don't want to use Android Virtual Device:
+
+https://www.genymotion.com
+
+## Android Development Environment
+
+You can also setup Android Development Environment + Simulator:
+
+https://facebook.github.io/react-native/docs/getting-started.html
+
+## Configure GitHub Account
+
+The optimal way of pushing to GitHubis using SSH instead of user/pass auth.
+
+It's recommented that you [add your public SSH key to your GitHub account](https://help.github.com/en/github/authenticating-to-github/adding-a-new-ssh-key-to-your-github-account).
+
+## Configure GPG Keys for signing commits
+
+In order to increase security we require all commits in `status-react` repo to be signed with a GPG key.
+
+Steps:
+1. [Generate a new GPG key](https://help.github.com/en/github/authenticating-to-github/generating-a-new-gpg-key)
+2. [Setup Git to use your GPG key](https://help.github.com/en/github/authenticating-to-github/telling-git-about-your-signing-key)
+3. [Setup Git to sign commits](https://help.github.com/en/github/authenticating-to-github/signing-commits)
+4. [Setup GitHub to validate commits](https://help.github.com/en/github/authenticating-to-github/adding-a-new-gpg-key-to-your-github-account)

TROUBLESHOOTING.md

@@ -0,0 +1,101 @@
+# [DEPRECATED] Undefined is not an object evaluating `register_handler_fx`
+
+## Deprecation note
+
+This type of error should not occur anymore now that we require the namespace in the `fx.cljs` file. 
+
+It can however happen with other macros requiring a cljs namespace. 
+
+The general fix for that type of issue is to have two files for the namespace where your macros are defined, let's say for `my-project.my-macro` namespace you would have: 
+- my_macro.cljs in which you need `(:require-macros my-project.my-macro)` and `(:require my-project.the-namespace-used-in-the-macro)`
+- my_macro.clj in which you define the macro
+
+That way you don't need to use any magical call like `find-ns` or inline `require` with some kind of call only once switch (which was the root cause of another bug in ``defstyle`` macro because the compilation phase at which the evaluation of the switch is done was not properly considered).
+
+You also want to make sure users are using the macro by using a aliased namespace defined in require statement rather than require-macro and refer to the macro directly. Otherwise it won't require the cljs file and the require statement of the namespace in the macroexpension might not be there.
+
+## Stacktrace
+
+```
+13:25:22, Requiring: hi-base32
+13:25:23, Possible Unhandled Promise Rejection (id: 0):
+TypeError: undefined is not an object (evaluating 'status_im.utils.handlers.register_handler_fx')
+eval code
+eval@[native code]
+asyncImportScripts$@http://localhost:8081/index.bundle?platform=ios&dev=true&minify=false:200728:21
+tryCatch@http://localhost:8081/index.bundle?platform=ios&dev=true&minify=false:26567:23
+invoke@http://localhost:8081/index.bundle?platform=ios&dev=true&minify=false:26742:32
+tryCatch@http://localhost:8081/index.bundle?platform=ios&dev=true&minify=false:26567:23
+invoke@http://localhost:8081/index.bundle?platform=ios&dev=true&minify=false:26643:30
+http://localhost:8081/index.bundle?platform=ios&dev=true&minify=false:26653:21
+tryCallOne@http://localhost:8081/index.bundle?platform=ios&dev=true&minify=false:3725:16
+http://localhost:8081/index.bundle?platform=ios&dev=true&minify=false:3826:27
+_callTimer@http://localhost:8081/index.bundle?platform=ios&dev=true&minify=false:28405:17
+_callImmediatesPass@http://localhost:8081/index.bundle?pla<…>
+```
+
+## Cause
+
+- stacktrace mentions `register_handler_fx`, 
+- common cause is when requires have been cleaned up and a require of `status-im.utils.handlers` namespace was removed because it looked like it was unused but was actually used through a fx/defn macro
+
+## Solution
+
+go through known faulty commit looking for deleted requires
+
+
+# Git "unable to access" errors during `yarn install`
+
+## Description
+Developer updates `package.json` file with a new dependency using a GitHub URL. So it looks like this:
+```
+  "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#feature/exportKeyWithPath",
+```
+Afterwards, when running e.g. `make react-native-android`, they might see the following confusing error:
+```
+# macOS
+fatal: unable to access 'https://github.com/siphiuel/react-native-status-keycard.git/': SSL certificate problem: unable to get local issuer certificate
+# Linux
+fatal: unable to access 'https://github.com/status-im/react-native-status-keycard.git/': Could not resolve host: github.com
+info Visit https://yarnpkg.com/en/docs/cli/install for documentation about this command.
+```
+
+## Cause
+`yarn.lock` is not updated to be in sync with `package.json`.
+
+## Solution
+Update yarn.lock file. In order to do this, perform the following steps on a clean `status-react` repo:
+```
+cd status-react
+ln -sf mobile/js_files/package.json .
+ln -sf mobile/js_files/yarn.lock .
+yarn install
+```
+and don't forget to commit updated `yarn.lock` together with `package.json`.
+
+
+# adb server/client version mismatch errors
+
+## Description
+Running some adb commands, e.g. `adb devices` or `make android-ports` (in turn invokes `adb reverse`/`adb forward` commands) may display the following message:
+```
+adb server version (40) doesn't match this client (41); killing...
+```
+or the reverse
+```
+adb server version (41) doesn't match this client (40); killing...
+```
+
+This might cause all kinds of difficult-to-debug errors, e.g.:
+  -  not being able to find the device through `adb devices`
+  -  `make run-android` throwing `com.android.builder.testing.api.DeviceException: com.android.ddmlib.InstallException: device 'device-id' not found.`
+  -  `make run-android` throwing `- Error: Command failed: ./gradlew app:installDebug -PreactNativeDevServerPort=8081 Unable to install /status-react/android/app/build/outputs/apk/debug/app-debug.apk com.android.ddmlib.InstallException: EOF`
+  - dropped CLJS repl connections (that have been enabled previously with the help of `make android-ports`)
+
+## Cause
+System's local adb and Nix's adb differ. As adb include of server/client processes, this can cause subtle version errors that cause adb to kill mismatching server processes.
+
+## Solution
+Always use respective `make` commands, e.g. `make android-ports`, `make android-devices`, etc.
+
+Alternatively, run adb commands only from `make shell TARGET=android` shell. Don't forget the `TARGET=android` env var setting - otherwise `adb` will still be selected from the system's default location. You can double-check this by running `which adb`.

VERSION

@@ -1 +1 @@
-1.23.0
+1.3.1

android/app/BUCK

@@ -0,0 +1,53 @@
+import re
+
+# To learn about Buck see [Docs](https://buckbuild.com/).
+# To run your application with Buck:
+# - install Buck
+# - `npm start` - to start the packager
+# - `cd android`
+# - `cp ~/.android/debug.keystore keystores/debug.keystore`
+# - `./gradlew :app:copyDownloadableDepsToLibs` - make all Gradle compile dependencies available to Buck
+# - `buck install -r android/app` - compile, install and run application
+#
+
+lib_deps = []
+create_aar_targets(glob(["libs/*.aar"]))
+create_jar_targets(glob(["libs/*.jar"]))
+
+android_library(
+  name = 'all-libs',
+  exported_deps = lib_deps
+)
+
+android_library(
+  name = 'app-code',
+  srcs = glob([
+    'src/main/java/**/*.java',
+  ]),
+  deps = [
+    ':all-libs',
+    ':build_config',
+    ':res',
+  ],
+)
+
+android_build_config(
+  name = 'build_config',
+  package = 'im.status.ethereum',
+)
+
+android_resource(
+  name = 'res',
+  res = 'src/main/res',
+  package = 'im.status.ethereum',
+)
+
+android_binary(
+  name = 'app',
+  package_type = 'debug',
+  manifest = 'src/main/AndroidManifest.xml',
+  keystore = '//android/keystores:debug',
+  deps = [
+    ':app-code',
+  ],
+)

android/app/build.gradle

@@ -21,7 +21,7 @@ import com.sun.org.apache.xalan.internal.xsltc.compiler.Copy
  *   bundleAssetName: "index.android.bundle",
  *
  *   // the entry file for bundle generation
- *   entryFile: "index.js",
+ *   entryFile: "index.android.js",
  *
  *   // whether to bundle JS and assets in debug mode
  *   bundleInDebug: false,
@@ -70,34 +70,16 @@ import com.sun.org.apache.xalan.internal.xsltc.compiler.Copy
  *   inputExcludes: ["android/**", "ios/**"],
  *
  *   // override which node gets called and with what additional arguments
- *   nodeExecutableAndArgs: ["node", "--max-old-space-size=8192"],
+ *   nodeExecutableAndArgs: ["node"],
  *
  *   // supply additional arguments to the packager
  *   extraPackagerArgs: []
  * ]
  */
-
-/*
- Enabling Hermes on x86 devices is crashing the app after a few reloads,
- this flag can be used to disable Hermes while building app.
- https://github.com/status-im/status-mobile/issues/14031
- */
-
-def disableHermes = System.getenv('DISABLE_HERMES') == 'true'
-
 project.ext.react = [
     nodeExecutableAndArgs: ["node", "--max-old-space-size=16384"],
-    entryFile: "index.js",
-    /* NOTE: Hermes engine is required for Android 64-bit builds running on 64 devices,
-     *       to guard against a hang in the UI thread after invoking status-go.
-     * Also a clean and rebuild is required when changing this. */
-    enableHermes: !disableHermes,
-    /* Disable 'The first definition was here.' warnings */
-    hermesFlagsRelease: ["-w"],
-    /* FIXME: Workaround for crash caused by missing libhermes-executor-release.so.
-     * https://github.com/facebook/react-native/issues/32928 */
-    deleteDebugFilesForVariant: { false },
-    enableVmCleanup: false,
+    entryFile: "index.android.js",
+    enableHermes: true,     // clean and rebuild if changing. NOTE: Hermes engine is required for Android 64-bit builds running on 64 devices, to guard against a hang in the UI thread after invoking status-go
     bundleInPr: true,
     inputExcludes: ["android/**", "ios/**", "react-native/**", "src/**", "test/**"]
 ]
@@ -136,21 +118,6 @@ def jscFlavor = 'org.webkit:android-jsc:+'
  */
 def enableHermes = project.ext.react.get("enableHermes", false);
 
-/**
- * Architectures to build native code for.
- */
-def reactNativeArchitectures() {
-    def value = project.getProperties().get("reactNativeArchitectures")
-    return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
-}
-
-def getCommitHash = { ->
-    if (project.hasProperty("commitHash")) {
-        return project.commitHash
-    }
-    return "unknown"
-}
-
 def getVersionCode = { ->
     new ByteArrayOutputStream().withStream { stdOut ->
         if (project.hasProperty("versionCode")) {
@@ -168,14 +135,10 @@ def getVersionCode = { ->
 
 def getVersionName = { ->
     new ByteArrayOutputStream().withStream { stdOut ->
-        // TODO: probably not used, cleanup
         if (project.hasProperty("releaseVersion")) {
             return project.releaseVersion
         }
-        /* Necessary because Android Studio uses wrong PWD.
-         * Is actually absolute directory path of this file. */
-        def configDir = project.projectDir.toString()
-        version = new File(configDir + '/../../VERSION').text
+        version = new File('../VERSION').text
         return version.replaceAll("\\s","")
     }
 }
@@ -196,13 +159,11 @@ def getEnvOrConfig = { varName ->
 }
 
 android {
-    ndkVersion rootProject.ext.ndkVersion
-
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     defaultConfig {
@@ -213,77 +174,13 @@ android {
         versionCode getVersionCode()
         versionName getVersionName()
         missingDimensionStrategy 'react-native-camera', 'general'
-        manifestPlaceholders = [commitHash: getCommitHash()]
         /* this needs to be empty if we want APKs split by ABIs */
         if (!getEnvOrConfig('ANDROID_ABI_SPLIT').toBoolean()) {
             ndk {
                 abiFilters getEnvOrConfig('ANDROID_ABI_INCLUDE').split(";")
             }
         }
-	buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
-
-        if (isNewArchitectureEnabled()) {
-            // We configure the NDK build only if you decide to opt-in for the New Architecture.
-            externalNativeBuild {
-                ndkBuild {
-                    arguments "APP_PLATFORM=android-21",
-                        "APP_STL=c++_shared",
-                        "NDK_TOOLCHAIN_VERSION=clang",
-                        "GENERATED_SRC_DIR=$buildDir/generated/source",
-                        "PROJECT_BUILD_DIR=$buildDir",
-                        "REACT_ANDROID_DIR=$rootDir/../node_modules/react-native/ReactAndroid",
-                        "REACT_ANDROID_BUILD_DIR=$rootDir/../node_modules/react-native/ReactAndroid/build",
-                        "NODE_MODULES_DIR=$rootDir/../node_modules"
-                    cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1"
-                    cppFlags "-std=c++17"
-                    // Make sure this target name is the same you specify inside the
-                    // src/main/jni/Android.mk file for the `LOCAL_MODULE` variable.
-                    targets "rndiffapp_appmodules"
-                }
-            }
-        }
     }
-
-       if (isNewArchitectureEnabled()) {
-           // We configure the NDK build only if you decide to opt-in for the New Architecture.
-           externalNativeBuild {
-               ndkBuild {
-                   path "$projectDir/src/main/jni/Android.mk"
-               }
-           }
-           def reactAndroidProjectDir = project(':ReactAndroid').projectDir
-           def packageReactNdkDebugLibs = tasks.register("packageReactNdkDebugLibs", Copy) {
-               dependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck")
-               from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
-               into("$buildDir/react-ndk/exported")
-           }
-           def packageReactNdkReleaseLibs = tasks.register("packageReactNdkReleaseLibs", Copy) {
-               dependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck")
-               from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
-               into("$buildDir/react-ndk/exported")
-           }
-           afterEvaluate {
-               // If you wish to add a custom TurboModule or component locally,
-               // you should uncomment this line.
-               // preBuild.dependsOn("generateCodegenArtifactsFromSchema")
-               preDebugBuild.dependsOn(packageReactNdkDebugLibs)
-               preReleaseBuild.dependsOn(packageReactNdkReleaseLibs)
-
-               // Due to a bug inside AGP, we have to explicitly set a dependency
-               // between configureNdkBuild* tasks and the preBuild tasks.
-               // This can be removed once this is solved: https://issuetracker.google.com/issues/207403732
-               configureNdkBuildRelease.dependsOn(preReleaseBuild)
-               configureNdkBuildDebug.dependsOn(preDebugBuild)
-               reactNativeArchitectures().each { architecture ->
-                   tasks.findByName("configureNdkBuildDebug[${architecture}]")?.configure {
-                       dependsOn("preDebugBuild")
-                   }
-                   tasks.findByName("configureNdkBuildRelease[${architecture}]")?.configure {
-                       dependsOn("preReleaseBuild")
-                   }
-               }
-           }
-       }
     /**
      * Arbitrary project metadata
      * https://docs.gradle.org/current/dsl/org.gradle.api.plugins.ExtraPropertiesExtension.html
@@ -302,12 +199,6 @@ android {
         exclude '/lib/mips64/**'
         exclude '/lib/armeabi/**'
 
-        pickFirst '**/armeabi-v7a/libc++_shared.so'
-        pickFirst '**/x86/libc++_shared.so'
-        pickFirst '**/arm64-v8a/libc++_shared.so'
-        pickFirst '**/x86_64/libc++_shared.so'
-        pickFirst '**/x86/libjsc.so'
-        pickFirst '**/armeabi-v7a/libjsc.so'
 
         /** Fix for: Execution failed for task ':app:transformNativeLibsWithStripDebugSymbolForDebug'.
         *   with recent version of ndk (17.0.4754217)
@@ -319,6 +210,21 @@ android {
         jumboMode true
         javaMaxHeapSize "8g"
     }
+    signingConfigs {
+        debug {
+            storeFile file('debug.keystore')
+            storePassword 'android'
+            keyAlias 'androiddebugkey'
+            keyPassword 'android'
+        }
+        release {
+            /* environment variables take precedence over gradle.properties file */
+            storeFile     file(getEnvOrConfig('KEYSTORE_PATH').replaceAll("~", System.properties['user.home']))
+            storePassword getEnvOrConfig('KEYSTORE_PASSWORD')
+            keyAlias      getEnvOrConfig('KEYSTORE_ALIAS')
+            keyPassword   getEnvOrConfig('KEYSTORE_KEY_PASSWORD')
+        }
+    }
     splits {
         abi {
             reset()
@@ -327,26 +233,20 @@ android {
             universalApk true
         }
     }
-    signingConfigs {
-        debug {
-            storeFile file('debug.keystore')
-            storePassword 'android'
-            keyAlias 'androiddebugkey'
-            keyPassword 'android'
-        }
-    }
     buildTypes {
         debug {
             applicationIdSuffix ".debug"
             debuggable          true
             versionNameSuffix   "-SNAPSHOT"
-            resValue "string", "build_config_package", "im.status.ethereum"
             signingConfig signingConfigs.debug
+            resValue "string", "build_config_package", "im.status.ethereum"
         }
         release {
+            // Caution! In production, you need to generate your own keystore file.
+            // see https://facebook.github.io/react-native/docs/signed-apk-android.
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
-            signingConfig null
+            signingConfig signingConfigs.release
         }
         pr {
             initWith release
@@ -386,15 +286,13 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "com.facebook.react:react-native:+"  // From node_modules
-    implementation 'com.facebook.soloader:soloader:0.10.3+'
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
-    implementation "androidx.core:core-splashscreen:1.0.0"
 
     if (enableHermes) {
-      //noinspection GradleDynamicVersion
-      implementation("com.facebook.react:hermes-engine:+") { // From node_modules
-          exclude group: 'com.facebook.fbjni' }
-      } else {
+      def hermesPath = "../../node_modules/hermes-engine/android/";
+      debugImplementation files(hermesPath + "hermes-debug.aar")
+      releaseImplementation files(hermesPath + "hermes-release.aar")
+      prImplementation files(hermesPath + "hermes-release.aar")
+    } else {
       implementation jscFlavor
     }
 
@@ -404,7 +302,6 @@ dependencies {
 
     implementation 'androidx.multidex:multidex:2.0.1' // only needed if minSdkVersion is less than 21 (https://developer.android.com/studio/build/multidex)
     implementation project(':react-native-dialogs')
-    implementation project(':react-native-blur')
     // Force using exact RN version instead of relying on gradle dependency resolution
     // https://docs.gradle.org/current/userguide/introduction_dependency_management.html#sec:dependency_resolution
     // NOTE: Uncomment if building RN from a fork
@@ -412,25 +309,8 @@ dependencies {
     implementation project(':react-native-status')
     implementation project(':react-native-status-keycard')
     implementation 'com.github.status-im:function:0.0.1'
-    implementation 'com.facebook.fresco:fresco:2.5.0'
-    implementation 'com.facebook.fresco:animated-gif:2.5.0'
-    implementation "com.squareup.okhttp3:okhttp-tls:4.9.2"
-}
-
-if (isNewArchitectureEnabled()) {
-    // If new architecture is enabled, we let you build RN from source
-    // Otherwise we fallback to a prebuilt .aar bundled in the NPM package.
-    // This will be applied to all the imported transtitive dependency.
-    configurations.all {
-        resolutionStrategy.dependencySubstitution {
-            substitute(module("com.facebook.react:react-native"))
-                     .using(project(":ReactAndroid"))
-                        .because("On New Architecture we're building React Native from source")
-                            substitute(module("com.facebook.react:hermes-engine"))
-                                .using(project(":ReactAndroid:hermes-engine"))
-                                    .because("On New Architecture we're building Hermes from source")
-        }
-    }
+    implementation 'com.facebook.fresco:fresco:2.0.0'
+    implementation 'com.facebook.fresco:animated-gif:2.0.0'
 }
 
 def getLocalNDKDir = { ->
@@ -450,9 +330,9 @@ def getLocalNDKDir = { ->
 // puts all compile dependencies into folder libs for BUCK to use
 task hemroidBuild(type: Exec) {
     def localNdkDir = getLocalNDKDir()
-    def ndkDir = System.env.ANDROID_NDK_ROOT
+    def ndkDir = System.env.ANDROID_NDK
     if (localNdkDir != null) {
-        ndkDir = localNdkDir
+        ndkDir = localNdkDir 
     }
 
     def execPath = "$ndkDir/ndk-build"
@@ -466,11 +346,3 @@ task hemroidBuild(type: Exec) {
 preBuild.dependsOn hemroidBuild
 
 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
-
-def isNewArchitectureEnabled() {
-    // To opt-in for the New Architecture, you can either:
-    // - Set `newArchEnabled` to true inside the `gradle.properties` file
-    // - Invoke gradle with `-newArchEnabled=true`
-    // - Set an environment variable `ORG_GRADLE_PROJECT_newArchEnabled=true`
-    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
-}

android/app/proguard-rules.pro

@@ -15,9 +15,6 @@
 
 # React Native
 
--keep class com.facebook.hermes.unicode.** { *; }
--keep class com.facebook.jni.** { *; }
-
 # Keep our interfaces so they can be used by other ProGuard rules.
 # See http://sourceforge.net/p/proguard/bugs/466/
 -keep,allowobfuscation @interface com.facebook.proguard.annotations.DoNotStrip
@@ -64,15 +61,3 @@
 -dontwarn java.nio.file.*
 -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
 -dontwarn okio.**
-
-# fast-image
-
--keep public class com.dylanvann.fastimage.* {*;}
--keep public class com.dylanvann.fastimage.** {*;}
--keep public class * implements com.bumptech.glide.module.GlideModule
--keep public class com.bumptech.glide.annotation.GlideModule
--keep public class * extends com.bumptech.glide.module.AppGlideModule
--keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
-  **[] $VALUES;
-  public *;
-}

android/app/src/debug/AndroidManifest.xml

@@ -2,12 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools">
 
-    <!-- These are added by React Native for debug mode, but actually aren't needed in release mode -->
-    <uses-permission tools:node="remove" android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
-    <!-- Remove licensing permission since we don't license our app and it blocks F-Droid submissions. -->
-    <uses-permission tools:node="remove" android:name="com.android.vending.CHECK_LICENSE"/>
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
-   <application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" android:usesCleartextTraffic="true" >
-        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
-    </application>
+    <application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" android:usesCleartextTraffic="true" />
 </manifest>

android/app/src/main/AndroidManifest.xml

@@ -17,34 +17,31 @@
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-                     android:maxSdkVersion="28" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />
 
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="com.android.vending.BILLING" />
+
+    <!-- these permissions should be removed -->
+    <!-- React Native unnecessary permissions (https://github.com/facebook/react-native/issues/5886) -->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" tools:node="remove"/>
 
     <application
             tools:replace="android:allowBackup"
             android:allowBackup="false"
             android:label="@string/app_name"
             android:icon="@mipmap/ic_launcher"
-            android:theme="@style/Theme.AppSplash"
+            android:theme="@style/AppTheme"
             android:name=".MainApplication"
             android:largeHeap="true"
-            android:usesCleartextTraffic="true"
-            android:extractNativeLibs="true">
-<!--        After upgrading Android Gradle Plugin to 4.2.0 and above we must get rid of `extractNativeLibs="true"`
-            and use`useLegacyPackaging` flag in our app's `build.gradle`-->
-        <meta-data android:name="commitHash" android:value="${commitHash}"/>
+            android:usesCleartextTraffic="true">
         <activity
                 android:name=".MainActivity"
-                android:exported="true"
                 android:label="@string/app_name"
-                android:theme="@style/Theme.AppSplash"
                 android:screenOrientation="portrait"
                 android:windowSoftInputMode="adjustResize"
-                android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|screenSize|smallestScreenSize|uiMode"
+                android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
                 android:resizeableActivity="false"
                 android:launchMode="singleTask">
             <intent-filter>
@@ -74,7 +71,7 @@
             </intent-filter>
         </activity>
         <activity android:name="com.facebook.react.devsupport.DevSettingsActivity"/>
-        <service android:name="im.status.ethereum.pushnotifications.ForegroundService"></service>
+        <service android:name="im.status.ethereum.module.ForegroundService"></service>
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"

android/app/src/main/java/im/status/ethereum/MainActivity.java

@@ -21,30 +21,23 @@ import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.provider.Settings;
 import android.os.Bundle;
-import android.os.Handler;
 import com.facebook.react.ReactActivityDelegate;
 import com.facebook.react.ReactRootView;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.WritableMap;
 import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView;
 
-import com.reactnativenavigation.NavigationActivity;
-import com.facebook.react.modules.core.PermissionListener;
-import androidx.core.splashscreen.SplashScreen;
+import com.facebook.react.ReactFragmentActivity;
 import com.facebook.react.ReactActivity;
+import com.facebook.react.modules.core.PermissionListener;
+import org.devio.rn.splashscreen.SplashScreen;
 
 import java.util.Properties;
 import im.status.ethereum.module.StatusThreadPoolExecutor;
-import im.status.ethereum.MainApplication;
 
-public class MainActivity extends NavigationActivity
+public class MainActivity extends ReactFragmentActivity
         implements ActivityCompat.OnRequestPermissionsResultCallback{
 
 
     @Nullable private PermissionListener mPermissionListener;
-    private boolean keepSplash = true;
-    private final int SPLASH_DELAY = 3200;
 
     private static void registerUncaughtExceptionHandler(final Context context) {
         final Thread.UncaughtExceptionHandler defaultUncaughtExceptionHandler = Thread.getDefaultUncaughtExceptionHandler();
@@ -104,16 +97,6 @@ public class MainActivity extends NavigationActivity
         return intent;
     }
 
-    private void tryToEmit(String eventName, WritableMap event) {
-        try {
-            ((MainApplication) getApplication()).getReactNativeHost()
-                                                .getReactInstanceManager()
-                                                .getCurrentReactContext()
-                                                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                                                .emit("url", event);
-        } catch(Exception e) {/* we expect NPE on first start, which is OK because we have a fallback */}
-    }
-
     @Override
     public void onNewIntent(final Intent intent) {
         super.onNewIntent(intent);
@@ -124,8 +107,18 @@ public class MainActivity extends NavigationActivity
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        SplashScreen splashScreen = SplashScreen.installSplashScreen(this);
-        setTheme(R.style.DarkTheme);
+
+        switch (getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) {
+            case Configuration.UI_MODE_NIGHT_YES:
+                setTheme(R.style.DarkTheme);
+
+                break;
+            case Configuration.UI_MODE_NIGHT_NO:
+                setTheme(R.style.LightTheme);
+                break;
+            default:
+                setTheme(R.style.LightTheme);
+        }
         // Make sure we get an Alert for every uncaught exceptions
         registerUncaughtExceptionHandler(MainActivity.this);
 
@@ -134,7 +127,7 @@ public class MainActivity extends NavigationActivity
         Log.v("RNBootstrap", "Available system memory "+getAvailableMemory(activityManager).availMem + ", maximum usable application memory " + activityManager.getLargeMemoryClass()+"M");
 
         setSecureFlag();
-
+        SplashScreen.show(this, true);
         // NOTE: Try to not restore the state https://github.com/software-mansion/react-native-screens/issues/17
         super.onCreate(null);
 
@@ -174,24 +167,9 @@ public class MainActivity extends NavigationActivity
             @Override
             public void run() {
                 System.loadLibrary("status-logs");
-
-                // when app is started but the Activity has been destroyed, the deep linking url event is
-                // not emitted when coming back to foreground. This is a workaround. If the problem is
-                // resolved in react-native this code should be removed
-                if (getIntent().getData() != null) {
-                    WritableMap event = Arguments.createMap();
-                    event.putString("url", getIntent().getDataString());
-                    // on first start emit will (silently) fail, but the regular deep linking handler will work
-                    tryToEmit("url", event);
-                }
             }
         };
 
-        splashScreen.setKeepOnScreenCondition(() -> keepSplash);
-
-        Handler handler = new Handler();
-        handler.postDelayed(() -> keepSplash = false, SPLASH_DELAY);
-
         StatusThreadPoolExecutor.getInstance().execute(r);
     }
 
@@ -200,7 +178,14 @@ public class MainActivity extends NavigationActivity
         super.onDestroy();
     }
 
-
+    /**
+     * Returns the name of the main component registered from JavaScript.
+     * This is used to schedule rendering of the component.
+     */
+    @Override
+    protected String getMainComponentName() {
+        return "StatusIm";
+    }
 
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
@@ -214,7 +199,7 @@ public class MainActivity extends NavigationActivity
     private static final Integer FREQUENCY_OF_REMINDER_IN_PERCENT = 5;
 
     private boolean shouldShowRootedNotification() {
-        if (RootUtil.isDeviceRooted() && BuildConfig.ENABLE_ROOT_ALERT == "1") {
+        if (RootUtil.isDeviceRooted()) {
             if (userRejectedRootedNotification()) {
                 return ((Math.random() * 100) < FREQUENCY_OF_REMINDER_IN_PERCENT);
             } else return true;
@@ -257,4 +242,14 @@ public class MainActivity extends NavigationActivity
             mPermissionListener = null;
         }
     }
+
+    @Override
+    protected ReactActivityDelegate createReactActivityDelegate() {
+        return new ReactActivityDelegate(this, getMainComponentName()) {
+            @Override
+            protected ReactRootView createRootView() {
+                return new RNGestureHandlerEnabledRootView(MainActivity.this);
+            }
+        };
+    }
 }

android/app/src/main/java/im/status/ethereum/MainApplication.java

@@ -1,37 +1,25 @@
 package im.status.ethereum;
 
 import androidx.multidex.MultiDexApplication;
-import android.content.Context;
-import android.webkit.WebView;
-import im.status.ethereum.newarchitecture.MainApplicationReactNativeHost;
-import java.lang.reflect.InvocationTargetException;
+import android.util.Log;
 import com.facebook.react.PackageList;
+import com.facebook.hermes.reactexecutor.HermesExecutorFactory;
+import com.facebook.react.bridge.JavaScriptExecutorFactory;
 
 import com.aakashns.reactnativedialogs.ReactNativeDialogsPackage;
 import com.facebook.react.ReactApplication;
-import cl.json.RNSharePackage;
 import com.facebook.react.ReactNativeHost;
-import com.reactnativenavigation.NavigationApplication;
-import com.reactnativenavigation.react.NavigationReactNativeHost;
 import com.facebook.react.ReactPackage;
-import com.facebook.react.config.ReactFeatureFlags;
-import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.modules.network.OkHttpClientProvider;
-import com.reactnativecommunity.blurview.BlurViewPackage;
+import com.facebook.soloader.SoLoader;
 
 import java.util.List;
 
 import im.status.ethereum.keycard.RNStatusKeycardPackage;
 import im.status.ethereum.module.StatusPackage;
-import im.status.ethereum.pushnotifications.PushNotificationPackage;
-import im.status.ethereum.StatusOkHttpClientFactory;
 
-import com.facebook.react.bridge.JSIModulePackage;
-import com.swmansion.reanimated.ReanimatedJSIModulePackage;
+public class MainApplication extends MultiDexApplication implements ReactApplication {
 
-public class MainApplication extends NavigationApplication {
-
-    private final ReactNativeHost mReactNativeHost = new NavigationReactNativeHost(this) {
+    private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
         @Override
         public boolean getUseDeveloperSupport() {
             return BuildConfig.DEBUG;
@@ -39,49 +27,28 @@ public class MainApplication extends NavigationApplication {
 
         @Override
         protected List<ReactPackage> getPackages() {
-
             StatusPackage statusPackage = new StatusPackage(RootUtil.isDeviceRooted());
-
             List<ReactPackage> packages = new PackageList(this).getPackages();
             packages.add(statusPackage);
             packages.add(new ReactNativeDialogsPackage());
             packages.add(new RNStatusKeycardPackage());
-            packages.add(new PushNotificationPackage());
-            packages.add(new BlurViewPackage());
             return packages;
         }
 
         @Override
         protected String getJSMainModuleName() {
-            return "index";
+            return "index.android";
         }
-
-	@Override
-	protected JSIModulePackage getJSIModulePackage() {
-	    return new ReanimatedJSIModulePackage();
-	}
     };
 
-    private final ReactNativeHost mNewArchitectureNativeHost = new MainApplicationReactNativeHost(this);
-
     @Override
     public ReactNativeHost getReactNativeHost() {
-        if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
-          return mNewArchitectureNativeHost;
-        } else {
-          return mReactNativeHost;
-        }
+        return mReactNativeHost;
     }
 
     @Override
     public void onCreate() {
         super.onCreate();
-        // If you opted-in for the New Architecture, we enable the TurboModule system
-        ReactFeatureFlags.useTurboModules = BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
-
-        OkHttpClientProvider.setOkHttpClientFactory(new StatusOkHttpClientFactory());
-
-        WebView.setWebContentsDebuggingEnabled(BuildConfig.DEBUG_WEBVIEW == "1");
+        SoLoader.init(this, /* native exopackage */ false);
     }
-
 }

android/app/src/main/java/im/status/ethereum/StatusOkHttpClientFactory.java

@@ -1,77 +0,0 @@
-package im.status.ethereum;
-
-import android.util.Log;
-
-import com.facebook.react.modules.network.OkHttpClientFactory;
-import com.facebook.react.modules.network.OkHttpClientProvider;
-
-import okhttp3.OkHttpClient;
-import okhttp3.Interceptor;
-import okhttp3.tls.HandshakeCertificates;
-
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.lang.RuntimeException;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.security.cert.CertificateFactory;
-import java.security.cert.X509Certificate;
-
-import im.status.ethereum.module.StatusPackage;
-
-class StatusOkHttpClientFactory implements OkHttpClientFactory {
-
-  private static final String TAG = "StatusOkHttpClientFactory";
-
-  public OkHttpClient createNewNetworkModuleClient() {
-      X509Certificate cert = null;
-      HandshakeCertificates clientCertificates;
-      String certPem = "";
-
-    // Get TLS PEM certificate from status-go
-    try {
-        // induce half second sleep because sometimes a cert is not immediately available
-        // TODO : remove sleep if App no longer crashes on Android 10 devices with
-        // java.lang.RuntimeException: Could not invoke WebSocketModule.connect
-        Thread.sleep(500);
-        certPem = StatusPackage.getImageTLSCert();
-    } catch(Exception e) {
-        Log.e(TAG, "Could not getImageTLSCert",e);
-    }
-    // Convert PEM certificate string to X509Certificate object
-    try {
-      // induce half second sleep because sometimes a cert is not immediately available
-      // TODO : remove sleep if App no longer crashes on Android 10 devices
-      // java.lang.RuntimeException: Could not invoke WebSocketModule.connect
-      Thread.sleep(500);
-      CertificateFactory cf = CertificateFactory.getInstance("X.509");
-      cert = (X509Certificate) cf.generateCertificate(new ByteArrayInputStream(certPem.getBytes()));
-    } catch(Exception e) {
-      Log.e(TAG, "Could not parse certificate",e);
-    }
-    // Create HandshakeCertificates object with our certificate
-    try {
-      // induce half second sleep because sometimes a cert is not immediately available
-      // TODO : remove sleep if App no longer crashes on Android 10 devices
-      // java.lang.RuntimeException: Could not invoke WebSocketModule.connect
-      Thread.sleep(500);
-      clientCertificates = new HandshakeCertificates.Builder()
-        .addPlatformTrustedCertificates()
-        .addTrustedCertificate(cert)
-        .build();
-    } catch(Exception e) {
-      Log.e(TAG, "Could not build HandshakeCertificates", e);
-      return null;
-    }
-
-    // Create OkHttpClient with custom SSL socket factory and trust manager
-    try {
-       return OkHttpClientProvider.createClientBuilder()
-        .sslSocketFactory(clientCertificates.sslSocketFactory(), clientCertificates.trustManager())
-        .build();
-    } catch(Exception e) {
-      Log.e(TAG, "Could not create OkHttpClient", e);
-      return null;
-    }
-  }
-}

android/app/src/main/java/im/status/ethereum/newarchitecture/MainApplicationReactNativeHost.java

@@ -1,103 +0,0 @@
-package im.status.ethereum.newarchitecture;
-import android.app.Application;
-import androidx.annotation.NonNull;
-import com.facebook.react.PackageList;
-import com.facebook.react.ReactInstanceManager;
-import com.facebook.react.ReactNativeHost;
-import com.facebook.react.ReactPackage;
-import com.facebook.react.ReactPackageTurboModuleManagerDelegate;
-import com.facebook.react.bridge.JSIModulePackage;
-import com.facebook.react.bridge.JSIModuleProvider;
-import com.facebook.react.bridge.JSIModuleSpec;
-import com.facebook.react.bridge.JSIModuleType;
-import com.facebook.react.bridge.JavaScriptContextHolder;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.UIManager;
-import com.facebook.react.fabric.ComponentFactory;
-import com.facebook.react.fabric.CoreComponentsRegistry;
-import com.facebook.react.fabric.FabricJSIModuleProvider;
-import com.facebook.react.fabric.ReactNativeConfig;
-import com.facebook.react.uimanager.ViewManagerRegistry;
-import im.status.ethereum.BuildConfig;
-import im.status.ethereum.newarchitecture.components.MainComponentsRegistry;
-import im.status.ethereum.newarchitecture.modules.MainApplicationTurboModuleManagerDelegate;
-import java.util.ArrayList;
-import java.util.List;
-/**
- * A {@link ReactNativeHost} that helps you load everything needed for the New Architecture, both
- * TurboModule delegates and the Fabric Renderer.
- *
- * <p>Please note that this class is used ONLY if you opt-in for the New Architecture (see the
- * `newArchEnabled` property). Is ignored otherwise.
- */
-public class MainApplicationReactNativeHost extends ReactNativeHost {
-  public MainApplicationReactNativeHost(Application application) {
-    super(application);
-  }
-  @Override
-  public boolean getUseDeveloperSupport() {
-    return BuildConfig.DEBUG;
-  }
-  @Override
-  protected List<ReactPackage> getPackages() {
-    List<ReactPackage> packages = new PackageList(this).getPackages();
-    // Packages that cannot be autolinked yet can be added manually here, for example:
-    //     packages.add(new MyReactNativePackage());
-    // TurboModules must also be loaded here providing a valid TurboReactPackage implementation:
-    //     packages.add(new TurboReactPackage() { ... });
-    // If you have custom Fabric Components, their ViewManagers should also be loaded here
-    // inside a ReactPackage.
-    return packages;
-  }
-  @Override
-  protected String getJSMainModuleName() {
-    return "index";
-  }
-  @NonNull
-  @Override
-  protected ReactPackageTurboModuleManagerDelegate.Builder
-      getReactPackageTurboModuleManagerDelegateBuilder() {
-    // Here we provide the ReactPackageTurboModuleManagerDelegate Builder. This is necessary
-    // for the new architecture and to use TurboModules correctly.
-    return new MainApplicationTurboModuleManagerDelegate.Builder();
-  }
-  @Override
-  protected JSIModulePackage getJSIModulePackage() {
-    return new JSIModulePackage() {
-      @Override
-      public List<JSIModuleSpec> getJSIModules(
-          final ReactApplicationContext reactApplicationContext,
-          final JavaScriptContextHolder jsContext) {
-        final List<JSIModuleSpec> specs = new ArrayList<>();
-        // Here we provide a new JSIModuleSpec that will be responsible of providing the
-        // custom Fabric Components.
-        specs.add(
-            new JSIModuleSpec() {
-              @Override
-              public JSIModuleType getJSIModuleType() {
-                return JSIModuleType.UIManager;
-              }
-              @Override
-              public JSIModuleProvider<UIManager> getJSIModuleProvider() {
-                final ComponentFactory componentFactory = new ComponentFactory();
-                CoreComponentsRegistry.register(componentFactory);
-                // Here we register a Components Registry.
-                // The one that is generated with the template contains no components
-                // and just provides you the one from React Native core.
-                MainComponentsRegistry.register(componentFactory);
-                final ReactInstanceManager reactInstanceManager = getReactInstanceManager();
-                ViewManagerRegistry viewManagerRegistry =
-                    new ViewManagerRegistry(
-                        reactInstanceManager.getOrCreateViewManagers(reactApplicationContext));
-                return new FabricJSIModuleProvider(
-                    reactApplicationContext,
-                    componentFactory,
-                    ReactNativeConfig.DEFAULT_CONFIG,
-                    viewManagerRegistry);
-              }
-            });
-        return specs;
-      }
-    };
-  }
-}

android/app/src/main/java/im/status/ethereum/newarchitecture/components/MainComponentsRegistry.java

@@ -1,30 +0,0 @@
-package im.status.ethereum.newarchitecture.components;
-import com.facebook.jni.HybridData;
-import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.react.fabric.ComponentFactory;
-import com.facebook.soloader.SoLoader;
-/**
- * Class responsible to load the custom Fabric Components. This class has native methods and needs a
- * corresponding C++ implementation/header file to work correctly (already placed inside the jni/
- * folder for you).
- *
- * <p>Please note that this class is used ONLY if you opt-in for the New Architecture (see the
- * `newArchEnabled` property). Is ignored otherwise.
- */
-@DoNotStrip
-public class MainComponentsRegistry {
-  static {
-    SoLoader.loadLibrary("fabricjni");
-  }
-  @DoNotStrip private final HybridData mHybridData;
-  @DoNotStrip
-  private native HybridData initHybrid(ComponentFactory componentFactory);
-  @DoNotStrip
-  private MainComponentsRegistry(ComponentFactory componentFactory) {
-    mHybridData = initHybrid(componentFactory);
-  }
-  @DoNotStrip
-  public static MainComponentsRegistry register(ComponentFactory componentFactory) {
-    return new MainComponentsRegistry(componentFactory);
-  }
-}

android/app/src/main/java/im/status/ethereum/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate.java

@@ -1,40 +0,0 @@
-package im.status.ethereum.newarchitecture.modules;
-import com.facebook.jni.HybridData;
-import com.facebook.react.ReactPackage;
-import com.facebook.react.ReactPackageTurboModuleManagerDelegate;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.soloader.SoLoader;
-import java.util.List;
-/**
- * Class responsible to load the TurboModules. This class has native methods and needs a
- * corresponding C++ implementation/header file to work correctly (already placed inside the jni/
- * folder for you).
- *
- * <p>Please note that this class is used ONLY if you opt-in for the New Architecture (see the
- * `newArchEnabled` property). Is ignored otherwise.
- */
-public class MainApplicationTurboModuleManagerDelegate
-    extends ReactPackageTurboModuleManagerDelegate {
-  private static volatile boolean sIsSoLibraryLoaded;
-  protected MainApplicationTurboModuleManagerDelegate(
-      ReactApplicationContext reactApplicationContext, List<ReactPackage> packages) {
-    super(reactApplicationContext, packages);
-  }
-  protected native HybridData initHybrid();
-  native boolean canCreateTurboModule(String moduleName);
-  public static class Builder extends ReactPackageTurboModuleManagerDelegate.Builder {
-    protected MainApplicationTurboModuleManagerDelegate build(
-        ReactApplicationContext context, List<ReactPackage> packages) {
-      return new MainApplicationTurboModuleManagerDelegate(context, packages);
-    }
-  }
-  @Override
-  protected synchronized void maybeLoadOtherSoLibraries() {
-    if (!sIsSoLibraryLoaded) {
-      // If you change the name of your application .so file in the Android.mk file,
-      // make sure you update the name here as well.
-      SoLoader.loadLibrary("status-im_appmodules");
-      sIsSoLibraryLoaded = true;
-    }
-  }
-}

android/app/src/main/jni/Android.mk

@@ -1,39 +0,0 @@
-THIS_DIR := $(call my-dir)
-include $(REACT_ANDROID_DIR)/Android-prebuilt.mk
-# If you wish to add a custom TurboModule or Fabric component in your app you
-# will have to include the following autogenerated makefile.
-# include $(GENERATED_SRC_DIR)/codegen/jni/Android.mk
-include $(CLEAR_VARS)
-LOCAL_PATH := $(THIS_DIR)
-# You can customize the name of your application .so file here.
-LOCAL_MODULE := rndiffapp_appmodules
-LOCAL_C_INCLUDES := $(LOCAL_PATH)
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
-# If you wish to add a custom TurboModule or Fabric component in your app you
-# will have to uncomment those lines to include the generated source
-# files from the codegen (placed in $(GENERATED_SRC_DIR)/codegen/jni)
-#
-# LOCAL_C_INCLUDES += $(GENERATED_SRC_DIR)/codegen/jni
-# LOCAL_SRC_FILES += $(wildcard $(GENERATED_SRC_DIR)/codegen/jni/*.cpp)
-# LOCAL_EXPORT_C_INCLUDES += $(GENERATED_SRC_DIR)/codegen/jni
-# Here you should add any native library you wish to depend on.
-LOCAL_SHARED_LIBRARIES := \
-  libfabricjni \
-  libfbjni \
-  libfolly_runtime \
-  libglog \
-  libjsi \
-  libreact_codegen_rncore \
-  libreact_debug \
-  libreact_nativemodule_core \
-  libreact_render_componentregistry \
-  libreact_render_core \
-  libreact_render_debug \
-  libreact_render_graphics \
-  librrc_view \
-  libruntimeexecutor \
-  libturbomodulejsijni \
-  libyoga
-LOCAL_CFLAGS := -DLOG_TAG=\"ReactNative\" -fexceptions -frtti -std=c++17 -Wall
-include $(BUILD_SHARED_LIBRARY)

android/app/src/main/jni/MainApplicationModuleProvider.cpp

@@ -1,20 +0,0 @@
-#include "MainApplicationModuleProvider.h"
-#include <rncore.h>
-namespace facebook {
-namespace react {
-std::shared_ptr<TurboModule> MainApplicationModuleProvider(
-    const std::string moduleName,
-    const JavaTurboModule::InitParams &params) {
-  // Here you can provide your own module provider for TurboModules coming from
-  // either your application or from external libraries. The approach to follow
-  // is similar to the following (for a library called `samplelibrary`:
-  //
-  // auto module = samplelibrary_ModuleProvider(moduleName, params);
-  // if (module != nullptr) {
-  //    return module;
-  // }
-  // return rncore_ModuleProvider(moduleName, params);
-  return rncore_ModuleProvider(moduleName, params);
-}
-} // namespace react
-} // namespace facebook

android/app/src/main/jni/MainApplicationModuleProvider.h

@@ -1,11 +0,0 @@
-#pragma once
-#include <memory>
-#include <string>
-#include <ReactCommon/JavaTurboModule.h>
-namespace facebook {
-namespace react {
-std::shared_ptr<TurboModule> MainApplicationModuleProvider(
-    const std::string moduleName,
-    const JavaTurboModule::InitParams &params);
-} // namespace react
-} // namespace facebook

android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.cpp

@@ -1,38 +0,0 @@
-#include "MainApplicationTurboModuleManagerDelegate.h"
-#include "MainApplicationModuleProvider.h"
-namespace facebook {
-namespace react {
-jni::local_ref<MainApplicationTurboModuleManagerDelegate::jhybriddata>
-MainApplicationTurboModuleManagerDelegate::initHybrid(
-    jni::alias_ref<jhybridobject>) {
-  return makeCxxInstance();
-}
-void MainApplicationTurboModuleManagerDelegate::registerNatives() {
-  registerHybrid({
-      makeNativeMethod(
-          "initHybrid", MainApplicationTurboModuleManagerDelegate::initHybrid),
-      makeNativeMethod(
-          "canCreateTurboModule",
-          MainApplicationTurboModuleManagerDelegate::canCreateTurboModule),
-  });
-}
-std::shared_ptr<TurboModule>
-MainApplicationTurboModuleManagerDelegate::getTurboModule(
-    const std::string name,
-    const std::shared_ptr<CallInvoker> jsInvoker) {
-  // Not implemented yet: provide pure-C++ NativeModules here.
-  return nullptr;
-}
-std::shared_ptr<TurboModule>
-MainApplicationTurboModuleManagerDelegate::getTurboModule(
-    const std::string name,
-    const JavaTurboModule::InitParams &params) {
-  return MainApplicationModuleProvider(name, params);
-}
-bool MainApplicationTurboModuleManagerDelegate::canCreateTurboModule(
-    std::string name) {
-  return getTurboModule(name, nullptr) != nullptr ||
-      getTurboModule(name, {.moduleName = name}) != nullptr;
-}
-} // namespace react
-} // namespace facebook

android/app/src/main/jni/MainApplicationTurboModuleManagerDelegate.h

@@ -1,30 +0,0 @@
-#include <memory>
-#include <string>
-#include <ReactCommon/TurboModuleManagerDelegate.h>
-#include <fbjni/fbjni.h>
-namespace facebook {
-namespace react {
-class MainApplicationTurboModuleManagerDelegate
-    : public jni::HybridClass<
-          MainApplicationTurboModuleManagerDelegate,
-          TurboModuleManagerDelegate> {
- public:
-  // Adapt it to the package you used for your Java class.
-  static constexpr auto kJavaDescriptor =
-      "Lcom/rndiffapp/newarchitecture/modules/MainApplicationTurboModuleManagerDelegate;";
-  static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject>);
-  static void registerNatives();
-  std::shared_ptr<TurboModule> getTurboModule(
-      const std::string name,
-      const std::shared_ptr<CallInvoker> jsInvoker) override;
-  std::shared_ptr<TurboModule> getTurboModule(
-      const std::string name,
-      const JavaTurboModule::InitParams &params) override;
-  /**
-   * Test-only method. Allows user to verify whether a TurboModule can be
-   * created by instances of this class.
-   */
-  bool canCreateTurboModule(std::string name);
-};
-} // namespace react
-} // namespace facebook

android/app/src/main/jni/MainComponentsRegistry.cpp

@@ -1,48 +0,0 @@
-#include "MainComponentsRegistry.h"
-#include <CoreComponentsRegistry.h>
-#include <fbjni/fbjni.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
-#include <react/renderer/components/rncore/ComponentDescriptors.h>
-namespace facebook {
-namespace react {
-MainComponentsRegistry::MainComponentsRegistry(ComponentFactory *delegate) {}
-std::shared_ptr<ComponentDescriptorProviderRegistry const>
-MainComponentsRegistry::sharedProviderRegistry() {
-  auto providerRegistry = CoreComponentsRegistry::sharedProviderRegistry();
-  // Custom Fabric Components go here. You can register custom
-  // components coming from your App or from 3rd party libraries here.
-  //
-  // providerRegistry->add(concreteComponentDescriptorProvider<
-  //        AocViewerComponentDescriptor>());
-  return providerRegistry;
-}
-jni::local_ref<MainComponentsRegistry::jhybriddata>
-MainComponentsRegistry::initHybrid(
-    jni::alias_ref<jclass>,
-    ComponentFactory *delegate) {
-  auto instance = makeCxxInstance(delegate);
-  auto buildRegistryFunction =
-      [](EventDispatcher::Weak const &eventDispatcher,
-         ContextContainer::Shared const &contextContainer)
-      -> ComponentDescriptorRegistry::Shared {
-    auto registry = MainComponentsRegistry::sharedProviderRegistry()
-                        ->createComponentDescriptorRegistry(
-                            {eventDispatcher, contextContainer});
-    auto mutableRegistry =
-        std::const_pointer_cast<ComponentDescriptorRegistry>(registry);
-    mutableRegistry->setFallbackComponentDescriptor(
-        std::make_shared<UnimplementedNativeViewComponentDescriptor>(
-            ComponentDescriptorParameters{
-                eventDispatcher, contextContainer, nullptr}));
-    return registry;
-  };
-  delegate->buildRegistryFunction = buildRegistryFunction;
-  return instance;
-}
-void MainComponentsRegistry::registerNatives() {
-  registerHybrid({
-      makeNativeMethod("initHybrid", MainComponentsRegistry::initHybrid),
-  });
-}
-} // namespace react
-} // namespace facebook

android/app/src/main/jni/MainComponentsRegistry.h

@@ -1,24 +0,0 @@
-#pragma once
-#include <ComponentFactory.h>
-#include <fbjni/fbjni.h>
-#include <react/renderer/componentregistry/ComponentDescriptorProviderRegistry.h>
-#include <react/renderer/componentregistry/ComponentDescriptorRegistry.h>
-namespace facebook {
-namespace react {
-class MainComponentsRegistry
-    : public facebook::jni::HybridClass<MainComponentsRegistry> {
- public:
-  // Adapt it to the package you used for your Java class.
-  constexpr static auto kJavaDescriptor =
-      "Lcom/rndiffapp/newarchitecture/components/MainComponentsRegistry;";
-  static void registerNatives();
-  MainComponentsRegistry(ComponentFactory *delegate);
- private:
-  static std::shared_ptr<ComponentDescriptorProviderRegistry const>
-  sharedProviderRegistry();
-  static jni::local_ref<jhybriddata> initHybrid(
-      jni::alias_ref<jclass>,
-      ComponentFactory *delegate);
-};
-} // namespace react
-} // namespace facebook

android/app/src/main/jni/OnLoad.cpp

@@ -1,10 +0,0 @@
-#include <fbjni/fbjni.h>
-#include "MainApplicationTurboModuleManagerDelegate.h"
-#include "MainComponentsRegistry.h"
-JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
-  return facebook::jni::initialize(vm, [] {
-    facebook::react::MainApplicationTurboModuleManagerDelegate::
-        registerNatives();
-    facebook::react::MainComponentsRegistry::registerNatives();
-  });
-}