bump version t0 0.13.4

Signed-off-by: Jakub Sokołowski <jakub@status.im>

.TOOLVERSIONS

@@ -0,0 +1,7 @@
+android-sdk-build-tools;28.0.1;
+android-sdk-platform;android-27;
+android-sdk;4333796;aa190cfd7299cd6a1c687355bb2764e4
+nix;2.2.1;
+react_native_cli;2.0.1;
+StatusImAppImage;20181208;
+StatusIm-Windows-base-image;20181113;

.carve_ignore

@@ -1,185 +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
-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?
-status-im.ui.components.colors/white
-status-im.ui.components.colors/black
-status-im.ui.components.core/animated-header
-status-im.ui.components.core/safe-area-provider
-status-im.ui.components.core/safe-area-consumer
-status-im.ui.components.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
-status-im.ui.components.spacing/padding-vertical
-status-im.utils.money/percent-change
-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
-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/babashka/fs/config.edn

@@ -1 +0,0 @@
-{:lint-as {babashka.fs/with-temp-dir clojure.core/let}}

.clj-kondo/babashka/sci/config.edn

@@ -1 +0,0 @@
-{:hooks {:macroexpand {sci.core/copy-ns sci.core/copy-ns}}}

.clj-kondo/babashka/sci/sci/core.clj

@@ -1,9 +0,0 @@
-(ns sci.core)
-
-(defmacro copy-ns
-  ([ns-sym sci-ns]
-   `(copy-ns ~ns-sym ~sci-ns nil))
-  ([ns-sym sci-ns opts]
-   `[(quote ~ns-sym)
-     ~sci-ns
-     (quote ~opts)]))

.clj-kondo/config.edn

@@ -1,75 +0,0 @@
-{:config-paths ["status-im"]
- :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      {:case-duplicate-test           {:level :error}
-                :case-quoted-test              {:level :error}
-                :case-symbol-test              {:level :error}
-                :clj-kondo-config              {:level :error}
-                :cond-else                     {:level :error}
-                :consistent-alias              {:level   :error
-                                                :aliases {clojure.set      set
-                                                          clojure.string   string
-                                                          clojure.walk     walk
-                                                          malli.core       malli
-                                                          malli.dev.pretty malli.pretty
-                                                          malli.dev.virhe  malli.virhe
-                                                          malli.error      malli.error
-                                                          malli.generator  malli.generator
-                                                          malli.transform  malli.transform
-                                                          malli.util       malli.util
-                                                          schema.core      schema
-                                                          taoensso.timbre  log}}
-                :deprecated-namespace          {:level :warning}
-                :docstring-blank               {:level :error}
-                :equals-true                   {:level :error}
-                :inline-def                    {:level :error}
-                :invalid-arity                 {:skip-args [status-im.utils.fx/defn utils.re-frame/defn]}
-                :loop-without-recur            {:level :error}
-                :minus-one                     {:level :error}
-                :misplaced-docstring           {:level :error}
-                :missing-body-in-when          {:level :error}
-                :missing-clause-in-try         {:level :error}
-                :missing-else-branch           {:level :error}
-                :not-empty?                    {:level :error}
-                :plus-one                      {:level :error}
-                :redundant-do                  {:level :error}
-                :redundant-let                 {:level :error}
-                :refer-all                     {:level :error}
-                :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.
-                                                :exclude [type name]}
-                :single-operand-comparison     {:level :error}
-                :syntax                        {:level :error}
-                :unbound-destructuring-default {:level :error}
-                :uninitialized-var             {:level :error}
-                :unknown-require-option        {:level :error}
-                :unreachable-code              {:level :error}
-                :unresolved-namespace          {:level :error}
-                ;; 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]}
-                :unresolved-var                {:level :error}
-                :unsorted-required-namespaces  {:level :error}
-                :unused-alias                  {:level :warning}
-                :unused-binding                {:level :error}
-                :unused-import                 {:level :error}
-                :unused-namespace              {:level :error}
-                :unused-private-var            {:level :error}
-                :unused-referred-var           {:level :error}
-                :use                           {:level :error}}
- :config-in-ns {mocks.js-dependencies {:linters {:clojure-lsp/unused-public-var {:level :off}}}}}

.clj-kondo/metosin/malli/config.edn

@@ -1,2 +0,0 @@
-{:lint-as {malli.experimental/defn schema.core/defn}
- :linters {:unresolved-symbol {:exclude [(malli.core/=>)]}}}

.clj-kondo/status-im/config.edn

@@ -1,2 +0,0 @@
-{:hooks   {:analyze-call {utils.i18n/label utils.i18n/label}}
- :linters {:status-im.linter/invalid-translation-keyword {:level :error}}}

.clj-kondo/status-im/utils/i18n.clj

@@ -1,26 +0,0 @@
-(ns utils.i18n
-  (:require [clj-kondo.hooks-api :as hooks]))
-
-(defn label
-  "Verify call to `utils.i18n/label` pass the translation keyword qualified with `t`."
-  [{:keys [node]}]
-  (let [[_ translation-key-node & _] (:children node)]
-    (when (and (hooks/keyword-node? translation-key-node)
-               (not= "t" (-> translation-key-node hooks/sexpr namespace)))
-      (hooks/reg-finding! (assoc (meta translation-key-node)
-                                 :message "Translation keyword should be qualified with \"t\""
-                                 :type    :status-im.linter/invalid-translation-keyword)))))
-
-(comment
-  ;; Valid
-  (label {:node     (hooks/parse-string "(i18n/label :t/foo {:var \"hello\"})")
-          :cljc     false
-          :lang     :cljs
-          :filename ""
-          :config   {}
-          :ns       ""
-          :context  nil})
-
-  ;; Invalid
-  (label {:node (hooks/parse-string "(i18n/label :foo)")})
-)

.dependabot/config.yml

@@ -1,22 +0,0 @@
-# https://dependabot.com/docs/config-file/
-
-version: 1
-update_configs:
-  # Keep build.gradle files up to date, batching pull requests weekly
-  - package_manager: "java:gradle"
-    directory: "/android"
-    update_schedule: "weekly"
-    default_reviewers:
-    - "jakubgs"
-    allowed_updates:
-      - match:
-          update_type: "security"
-  # Keep /mobile/js_files/yarn.lock up to date, batching pull requests weekly
-  - package_manager: "javascript"
-    directory: "/"
-    update_schedule: "weekly"
-    allowed_updates:
-    - match:
-        update_type: security
-    default_reviewers:
-    - "jakubgs"

.env

@@ -2,35 +2,22 @@ CACHED_WEBVIEWS_ENABLED=1
 DEBUG_WEBVIEW=1
 DEFAULT_NETWORK=mainnet_rpc
 DEV_BUILD=1
+ERC20_CONTRACT_WARNINGS=1
 ETHEREUM_DEV_CLUSTER=1
-EXTENSIONS=0
-FLEET=status.prod
+EXTENSIONS=1
+FLEET=eth.beta
 GROUP_CHATS_ENABLED=1
-LOG_LEVEL=info
+HARDWALLET_ENABLED=0
+LOG_LEVEL_STATUS_GO=info
+LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
 PFS_TOGGLE_VISIBLE=1
 POW_TARGET=0.002
 POW_TIME=1
-SNOOPY=0
+RN_BRIDGE_THRESHOLD_WARNINGS=0
 RPC_NETWORKS_ONLY=0
+STICKERS_ENABLED=1
 PARTITIONED_TOPIC=0
 CONTRACT_NODES=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
-TEST_STATEOFUS=1
-FAST_CREATE_COMMUNITY_ENABLED=1
+MOBILE_UI_FOR_DESKTOP=0

.env.e2e

@@ -1,9 +1,11 @@
 DEBUG_WEBVIEW=1
-DEFAULT_NETWORK=goerli_rpc
+DEFAULT_NETWORK=testnet_rpc
+ERC20_CONTRACT_WARNINGS=1
 ETHEREUM_DEV_CLUSTER=1
-EXTENSIONS=0
-FLEET=status.prod
+EXTENSIONS=1
+FLEET=eth.beta
 GROUP_CHATS_ENABLED=1
+LOG_LEVEL_STATUS_GO=info
 LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=0
 PAIRING_POPUP_DISABLED=1
@@ -11,25 +13,7 @@ PFS_ENCRYPTION_ENABLED=1
 PFS_TOGGLE_VISIBLE=1
 POW_TARGET=0.002
 POW_TIME=1
-SNOOPY=0
+RN_BRIDGE_THRESHOLD_WARNINGS=0
 STICKERS_ENABLED=1
 PARTITIONED_TOPIC=0
 CONTRACT_NODES=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

.env.jenkins

@@ -1,10 +1,13 @@
 CACHED_WEBVIEWS_ENABLED=1
 DEBUG_WEBVIEW=1
-DEFAULT_NETWORK=goerli_rpc
+DEFAULT_NETWORK=mainnet_rpc
+ERC20_CONTRACT_WARNINGS=1
 ETHEREUM_DEV_CLUSTER=1
-EXTENSIONS=0
-FLEET=status.prod
+EXTENSIONS=1
+FLEET=eth.beta
 GROUP_CHATS_ENABLED=1
+HARDWALLET_ENABLED=0
+LOG_LEVEL_STATUS_GO=info
 LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 MAINNET_WARNING_ENABLED=1
@@ -12,26 +15,8 @@ PFS_ENCRYPTION_ENABLED=1
 PFS_TOGGLE_VISIBLE=1
 POW_TARGET=0.002
 POW_TIME=1
-SNOOPY=0
+RN_BRIDGE_THRESHOLD_WARNINGS=0
 RPC_NETWORKS_ONLY=0
+STICKERS_ENABLED=1
 PARTITIONED_TOPIC=0
 CONTRACT_NODES=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,24 +1,20 @@
 DEBUG_WEBVIEW=1
 DEFAULT_NETWORK=mainnet_rpc
+ERC20_CONTRACT_WARNINGS=1
 ETHEREUM_DEV_CLUSTER=1
-EXTENSIONS=0
-FLEET=status.prod
+EXTENSIONS=1
+FLEET=eth.beta
 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
 PFS_TOGGLE_VISIBLE=1
 POW_TARGET=0.002
 POW_TIME=1
-SNOOPY=0
-KEYCARD_TEST_MENU=0
+RN_BRIDGE_THRESHOLD_WARNINGS=0
 RPC_NETWORKS_ONLY=0
+STICKERS_ENABLED=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

.env.nightly.staging.fleet

@@ -0,0 +1,19 @@
+DEBUG_WEBVIEW=1
+DEFAULT_NETWORK=mainnet_rpc
+ERC20_CONTRACT_WARNINGS=1
+ETHEREUM_DEV_CLUSTER=1
+EXTENSIONS=1
+FLEET=eth.staging
+GROUP_CHATS_ENABLED=1
+LOG_LEVEL_STATUS_GO=info
+LOG_LEVEL=debug
+MAILSERVER_CONFIRMATIONS_ENABLED=1
+MAINNET_WARNING_ENABLED=1
+PFS_ENCRYPTION_ENABLED=1
+PFS_TOGGLE_VISIBLE=1
+POW_TARGET=0.002
+POW_TIME=1
+RN_BRIDGE_THRESHOLD_WARNINGS=0
+STICKERS_ENABLED=0
+PARTITIONED_TOPIC=0
+CONTRACT_NODES=1

.env.prod

@@ -0,0 +1,19 @@
+DEBUG_WEBVIEW=0
+DEFAULT_NETWORK=mainnet_rpc
+ERC20_CONTRACT_WARNINGS=0
+ETHEREUM_DEV_CLUSTER=0
+EXTENSIONS=1
+FLEET=eth.beta
+GROUP_CHATS_ENABLED=1
+LOG_LEVEL_STATUS_GO=
+LOG_LEVEL=info
+MAILSERVER_CONFIRMATIONS_ENABLED=1
+MAINNET_WARNING_ENABLED=1
+PFS_ENCRYPTION_ENABLED=1
+PFS_TOGGLE_VISIBLE=0
+POW_TARGET=0.002
+POW_TIME=1
+RN_BRIDGE_THRESHOLD_WARNINGS=0
+RPC_NETWORKS_ONLY=1
+STICKERS_ENABLED=0
+PARTITIONED_TOPIC=0

.env.release

@@ -1,22 +0,0 @@
-DEBUG_WEBVIEW=0
-DEFAULT_NETWORK=mainnet_rpc
-ETHEREUM_DEV_CLUSTER=0
-EXTENSIONS=0
-FLEET=status.prod
-GROUP_CHATS_ENABLED=1
-LOG_LEVEL=
-MAILSERVER_CONFIRMATIONS_ENABLED=1
-MAINNET_WARNING_ENABLED=1
-PFS_ENCRYPTION_ENABLED=1
-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
-FAST_CREATE_COMMUNITY_ENABLED=0

.envrc

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

.eslintrc.js

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

.flowconfig

@@ -20,20 +20,15 @@
 
 # Ignore duplicate module providers
 # For RN Apps installed via npm, "Libraries" folder is inside node_modules/react-native but in the source repo it is in the root
-node_modules/react-native/Libraries/react-native/React.js
+.*/Libraries/react-native/React.js
 .*/Libraries/react-native/ReactNative.js
 .*/node_modules/jest-runtime/build/__tests__/.*
 
 ; Ignore polyfills
-node_modules/react-native/Libraries/polyfills/.*
+.*/Libraries/polyfills/.*
 
-; These should not be required directly
-; require from fbjs/lib instead: require('fbjs/lib/warning')
-node_modules/warning/.*
-; Flow doesn't support platforms
-.*/Libraries/Utilities/LoadingView.js
-[untyped]
-.*/node_modules/@react-native-community/cli/.*/.*
+; Ignore metro
+.*/node_modules/metro/.*
 
 [include]
 
@@ -45,39 +40,17 @@ node_modules/react-native/flow/
 esproposal.optional_chaining=enable
 esproposal.nullish_coalescing=enable
 
+module.system=haste
+
 esproposal.class_static_fields=enable
 esproposal.class_instance_fields=enable
 
-module.file_ext=.js
-module.file_ext=.json
-module.file_ext=.ios.js
-
-module.system=haste
-module.system.haste.use_name_reducers=true
-# get basename
-# get basename
-module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1'
-module.system.haste.name_reducers='^\(.*\)\.native$' -> '\1'
-module.system.haste.paths.blacklist=.*/__tests__/.*
-module.system.haste.paths.blacklist=.*/__tests__/.*
-module.system.haste.paths.blacklist=.*/__mocks__/.*
-module.system.haste.paths.blacklist=.*/__mocks__/.*
-module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/Animated/src/polyfills/.*
-module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/Libraries/.*
-module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/Libraries/.*
-module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/RNTester/.*
-module.system.haste.paths.whitelist=<PROJECT_ROOT>/node_modules/react-native/IntegrationTests/.*
-module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/react-native/react-native-implementation.js
-module.system.haste.paths.blacklist=<PROJECT_ROOT>/node_modules/react-native/Libraries/Animated/src/polyfills/.*
-
 experimental.strict_type_args=true
 
 munge_underscores=true
 
 module.name_mapper='^image![a-zA-Z0-9$_-]+$' -> 'GlobalImageStub'
-module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/react-native/react-native-implementation'
-module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/node_modules/react-native/\1'
-module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/node_modules/react-native/Libraries/Image/RelativeImageStub'
+module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
 
 module.file_ext=.js
 module.file_ext=.jsx
@@ -94,4 +67,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
 
 [version]
-^0.122.0
+^0.92.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
@@ -16,10 +18,19 @@
 # precedence. When someone opens a pull request that only
 # modifies Nix files, only @js-owner and not the global
 # owner(s) will be requested for a review.
-*.nix       @jakubgs
-/nix        @jakubgs
-/.github/   @jakubgs
+*.nix       @PombeirP @jakubgs
+/nix        @PombeirP @jakubgs
+/.github/   @PombeirP @jakubgs
 
 /components @status-im/status-core-ui
 
-/test/appium/ @churik
+desktop/                        @vkjr
+/desktop_files                  @vkjr
+modules/react-native-desktop*/  @vkjr
+modules/react-native-desktop*/  @vkjr
+
+/doc        @oskarth @mandrigin @yenda @jeluard
+
+/deployment @vkjr @PombeirP
+
+/test    @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)
+* [Join our Chat](http://get.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_TEMPLATE.md

@@ -0,0 +1,57 @@
+---
+name: Full Bug Report
+about: Full bug report.
+---
+
+[comment]: # (Please replace ... with your information. Remove < and >)
+
+### User Story
+
+As a <user|developer|...>, I want to <task> so that <goal>.
+
+### Description
+
+[comment]: # (Feature or Bug? i.e Type: Bug)
+*Type*: <Bug|Feature>
+
+[comment]: # (Describe the feature you would like, or briefly summarise the bug and what you did, what you expected to happen, and what actually happens. Sections below)
+*Summary*: ...
+
+#### Expected behavior
+
+[comment]: # (Describe what you expected to happen.)
+
+#### Actual behavior
+
+[comment]: # (Describe what actually happened.)
+
+### Reproduction
+
+[comment]: # (Describe how we can replicate the bug step by step.)
+
+- Open Status
+- ...
+- Step 3, etc.
+
+### Solution
+
+[comment]: # (Please summarise the solution and provide a task list on what needs to be fixed.)
+*Summary*:
+
+- [ ] ...
+- [ ] ...
+
+### Additional Information
+
+[comment]: # (Please do your best to fill this out.)
+- Status version: ...
+[comment]: # (Android or iOS.)
+- Operating System: <Android|iOS>
+
+#### Logs
+
+[comment]: # (if on Android please replicate bug whilst running adb logcat)
+
+```
+...
+```

.github/ISSUE_TEMPLATE/bug-report.md

@@ -1,34 +0,0 @@
----
-name: MVPBug Report
-about: MVPBug Report
-title: ''
-labels: 'E:Mobile Bug MVP'
-assignees: ''
-
----
-
-# Bug Report
-
-
-## Problem 
-[comment]: # (A problem description)
-
-
-#### Expected behavior
-
-
-#### Actual behavior
-
-
-### Reproduction
-
-1. 
-
-### Additional Information
-
-- Status version: nightly 
-- Operating System: Android, iOS
-
-
-[comment]: # (Please, add logs/notes if necessary)
-

.github/ISSUE_TEMPLATE/feature-issue.md

@@ -1,30 +0,0 @@
----
-name: Feature Issue
-about: Feature Issue
-title: ''
-labels: feature
-assignees: ''
-
----
-
-# Feature Issue
-
-[comment]: # (Please replace ... with your information. Remove < and >)
-
-### User Story
-
-As a <user|developer|...>, I want to <task> **so that** <goal>. 
-
-### Description
-
-[comment]: # (Describe the feature you would like and include designs and Figma links if available.)
-[comment]: # (Describe the use cases the implementation should cover. E.g. New users, existing users, public chat, group chat, etc)
-*Summary*: ...
-
-### Acceptance Criteria
-
-[comment]: # (Rules for the future PR to be accepted.)
-
-### Notes
-
-[comment]: # (For the developer who will implement. Include planning poker estimates, guidance, etc.)

.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/PULL_REQUEST_TEMPLATE.md

@@ -63,10 +63,4 @@ Documentation change PR (review please): https://github.com/status-im/status.im/
 
 <!-- (PRs will only be accepted if squashed into single commit.) -->
 
-### Before and after screenshots comparison
-
-| Figma (if available) | iOS (if available)    | Android (if available)
-| --- | --- | --- |
-| Please embed Image/Video here of the before and after.  | Please embed Image/Video here of the before and after.  | Please embed Image/Video here of the before and after. |
-
 status: ready <!-- Can be ready or wip -->

.github/github-bot.yml

@@ -2,16 +2,20 @@ _extends: probot-settings
 
 project-board:
   name: 'Pipeline for QA'
-  min-reviewers: 1
   tested-pr-label-name: 'Tested - Issues'
   contributor-column-name: 'CONTRIBUTOR'
   review-column-name: 'REVIEW'
   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-end-to-end-tests'
   kickoff-column-name: 'E2E Tests'
 
 github-team:
   slug: 'clojure'
+
+prchecklist:
+  title: Pull Request Checklist
+  checklist:
+    - 'Have you updated the documentation, if impacted (e.g. [docs.status.im](https://docs.status.im/docs/build_status.html))?'

.github/package-lock-snitch.config.json

@@ -1,6 +1,7 @@
 {
     "recipients": [
         "jakubgs",
+        "mandrigin",
         "corpetty"
     ]
-}
+}

.gitignore

@@ -7,9 +7,6 @@
 
 # Xcode
 #
-/ios/.xcode.env.local
-/component-spec
-result/
 build/
 *.pbxuser
 !default.pbxuser
@@ -34,21 +31,18 @@ project.xcworkspace
 .gradle
 *.iml
 **/android/.project
-**/android/.settings/org.eclipse.buildship.core.prefs
-local.properties
 
 # Atom
 .tags*
 
 # VS Code
-.vscode/
-workspace.code-workspace
+.vscode/ipch/
 
 # node.js
 #
 node_modules/
-node_modules.tmp/
 npm-debug.log
+.babelrc
 yarn-error.log
 default.realm/
 
@@ -58,7 +52,6 @@ buck-out/
 android/app/libs
 android/app/obj
 android/keystores/debug.keystore
-!debug.keystore
 
 # Generated by clj-rn
 #
@@ -69,6 +62,9 @@ env/dev/env/config.cljs
 externs/
 shim.js
 
+# Desktop build
+index.desktop.js
+
 # Generated by lein voom
 #
 /pom.xml
@@ -84,9 +80,6 @@ figwheel_server.log
 .lein-failures
 .lein-repl-history
 
-# Shadow
-.shadow-cljs
-
 ## Doo
 #
 out
@@ -97,12 +90,10 @@ doo-index.html
 
 # Status
 Statusgo.framework
-Statusgo.xcframework
 
 #ios
-/ios/Pods/
-/ios/logs/
-/ios/StatusIm.xcworkspace
+ios/Pods
+ios/StatusIm.xcworkspace
 .ruby-version
 status-e2e/
 
@@ -127,8 +118,12 @@ 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_files' and 'mobile_files'
+/VERSION
 /package-lock.json
+/package.json
+/metro.config.js
+/yarn.lock
 /.re-natal
 /re-natal
 
@@ -136,6 +131,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.*
@@ -146,51 +162,4 @@ conan.cmake
 
 # nix
 /.ran-setup
-/.nix-gcroots/
-/result
-
-# modules
-status-modules/translations
-status-modules/cljs
-status-modules/resources
-
-## coverage
-/.nyc_output
-/coverage-report
-
-## fiddle
-/fiddle/node_modules/
-/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
-
-## clj-kondo
-/.clj-kondo/taoensso/*
-/.clj-kondo/babashka/*
+/.nix-gcroots/

.lsp/config.edn

@@ -1 +0,0 @@
-{:clean {:ns-inner-blocks-indentation :keep}}

.nycrc

@@ -1,17 +0,0 @@
-{
-  "include": [
-    "target/test/status_im/**"
-  ],
-  "exclude": [
-    "target/test/status_im/test/**",
-    "target/test/status_im/ui/**"
-  ],
-  "report-dir": "./coverage-report",
-  "all": true,
-  "source-map": true,
-  "produce-source-map": true,
-  "instrument": true,
-  "exclude-after-remap": false,
-  "extension": [".js"],
-  "reporter": ["lcovonly"]
-}

.prettierignore

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

.prettierrc.js

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

.vscode/settings.example.json

@@ -1,12 +0,0 @@
-{
-    "editor.formatOnSave": true,
-    "clojure.format.enable": false,
-    "[clojure]": {
-        "editor.defaultFormatter": "rflagreca.vscode-clj-zprint"
-    },
-    "vscode-clj-zprint.IgnoreExternalFiles": false,
-    "vscode-clj-zprint.CommunityFormatting": false,
-    "vscode-clj-zprint.OptionsMap": "",
-    "vscode-clj-zprint.width": "",
-    "vscode-clj-zprint.Styles.UseOnlyTheseStyles": false
-}

.watchmanconfig

@@ -1,6 +0,0 @@
-{
-    "ignore_dirs": [
-        "android/build",
-        "target"
-    ]
-}

.zprintrc

@@ -1,56 +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"
-  "reg-event-fx"    :arg1-pair
-  "reg-fx"          :arg1-pair
-  "testing"         :arg1-body
-  "deftest-sub"     :arg1-body
-  "wait-for"        :arg1-body
-  "with-deps-check" :arg1-body
-  "schema/=>"       :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}}}}}

CHANGELOG.md

@@ -0,0 +1,124 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
+and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
+
+## [0.9.28 - Unreleased]
+### Added
+- Allow numbers in chat topics
+### Fixed
+Fix app freeze on recover with wrong password
+### Changed
+
+## [0.9.27]
+### Added
+- Added BRLN coin #5582
+- Added SuperRare token support #5496
+- Setting to remember login passwords iOS
+- ENS username resolution in Chat for stateofus.eth usernames (testnet only)
+
+### Fixed
+- Improve contact code validation #5612 #5613
+- Frequent logouts on iOS
+- Peepeth incompatibilities on Android #5726
+- Realm vulnerability PR
+- Fixed how node version is shown on the about screen #5688
+- Transaction fixes #5694 #5709
+
+### Changed
+- Updated Bounties.network address
+- Update status-go to v0.13.1
+
+## [0.9.26]
+### Added
+- Allow user to remove custom avatar
+### Fixed
+
+### Changed
+- Improved validation in account recovery. We now show a warning if any words are not from our mnemonic dictionary.
+
+## [0.9.25]
+### Added
+- Add MOKSHA token on Rinkeby
+
+### Changed
+- Update REP contract address
+- Update mailservers on Rinkeby network
+- Update url of Bounties Network DApp
+
+## [0.9.24 - 2018-08-01]
+### Fixed
+- Security patch for DApp browser
+
+## [0.9.23 - 2018-07-23]
+### Added
+- Added dismiss button to "Add to contacts" bar
+
+### Fixed
+- Partially fixed issue with 0 fiat in main Wallet screen. We are now explicitly showing an error when app can't fetch
+asset prices, instead of silently failing.
+
+### Changed
+
+## 0.9.23 - 2018-07-23
+### Added
+- iPad support. Status is now displayed at full native resolution on iPad's
+- Deep links support
+- Persist browser history
+- Added refresh button
+- Added more dapps
+- Allow for setting custom network id
+- Sound for Push Notifications, tap on PN opens corresponding chat
+
+### Fixed
+- Fixed Sign in: Cannot paste text within password field [#3931]
+- Fixed chat message layout for right-to-left languages
+- Fixed parsing of messages containing multiple dots (elipsis)
+- Fixed Webview: Screen cut off when using ERC dEX DApp [#3131]
+- Fixed links targeting new tabs [#4413]
+- Fixed blinking token amounts in transaction history
+- Fixed/corrected fiat values in /send and /request messages
+- Automatically converts recovery phrase to lowercase during account recovery
+- Fixed unread messages counter
+- Fixed incoming messages timestamp
+- Fixed gas validation: Showing message when total amount being sent plus the max gas cost exceed the balance [#3441]
+
+### Changed
+- Removed Mixpanel integration
+
+## [0.9.22] - 2018-07-09
+### Added
+- Added Farsi public #status channel
+- Spam moderation
+- Collectibles support (CryptoKitties, CryptoStrikers and Etheremon)
+- Added more dapps
+- Universal and deep links for public chats, browsing dapps, viewing profiles
+
+### Fixed
+- Fixed mailservers connectivity issue
+- Clear chat action correctly clear the unread messages counter
+- Gracefully handle realm decryption failures by showing a pop up asking the user to reset the data
+
+### Changed
+- Downgraded React Native to 0.53.3 for improved performance and decreased battery consumption
+- When joining a chat only download one day of history
+
+## [0.9.21] - 2018-06-25
+### Added
+- Mainnet is enabled by default on new installations. Upgrades will need to manually switch.
+- Chat now supports sending SNT and other tokens in 1-1 chats
+- New chat UI for /send and /receive commands
+- Updated chat message styling
+- Updated toolbar style
+- Updated DApp list
+- New help links on the Profile tab. Read our Beta FAQ, file a bug, or suggest and vote on features.
+- Performance improvements when fetching old messages
+- Added 5 new default public chats for our friends speaking Korean, Chinese, Japanese, Russian and Spanish.
+
+### Fixed
+- Prevented empty commands from being sent in chat
+- Fixed minimum amounts in transactions
+- Fixed an issue where contacts names may not be shown
+- Removed log files from release builds
+- Fixed an issue with transactions when navigating back

Makefile

@@ -1,6 +1,5 @@
-.PHONY: nix-add-gcroots clean nix-clean run-metro test release _list _fix-node-perms _tmpdir-rm
+.PHONY: add-gcroots clean clean-nix react-native-android react-native-ios react-native-desktop test release _list
 
-help: SHELL := /bin/sh
 help: ##@other Show this help
 	@perl -e '$(HELP_FUN)' $(MAKEFILE_LIST)
 
@@ -14,420 +13,220 @@ 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\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
-ifndef BUILD_TAG
-export BUILD_TAG := $(shell git rev-parse --short HEAD)
+export NIX_CONF_DIR = $(PWD)/nix
+
+export REACT_SERVER_PORT ?= 5001 # any value different from default 5000 will work; this has to be specified for both the Node.JS server process and the Qt process
+
+# WARNING: This has to be located right before the targets
+ifdef IN_NIX_SHELL
+SHELL := env bash
+else
+SHELL := ./nix/shell.sh
 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.
-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
+# Main targets
 
-# 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
-# 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
+clean: SHELL := /bin/sh
+clean: ##@prepare Remove all output folders
+	git clean -dxf -f
 
-# Useful for Android release builds
-TMP_BUILD_NUMBER := $(shell ./scripts/version/gen_build_no.sh | cut -c1-10)
+clean-nix: SHELL := /bin/sh
+clean-nix: ##@prepare Remove complete nix setup
+	sudo rm -rf /nix ~/.nix-profile ~/.nix-defexpr ~/.nix-channels ~/.cache/nix ~/.status .nix-gcroots
 
-# 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
-endif
+add-gcroots: ##@prepare Add Nix GC roots to avoid status-react expressions being garbage collected
+	scripts/add-gcroots.sh
 
-#----------------
-# Nix targets
-#----------------
-
-# WARNING: This has to be located right before all the targets.
-SHELL := ./nix/scripts/shell.sh
-
-shell: export TARGET ?= default
 shell: ##@prepare Enter into a pre-configured shell
 ifndef IN_NIX_SHELL
 	@ENTER_NIX_SHELL
 else
-	@echo "${YELLOW}Nix shell is already active$(RESET)"
+	@echo "Nix shell is already active"
 endif
 
-nix-repl: SHELL := /bin/sh
-nix-repl: ##@nix Start an interactive Nix REPL
-	nix repl default.nix
-
-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/scripts/clean.sh
-
-nix-purge: SHELL := /bin/sh
-nix-purge: ##@nix Completely remove Nix setup, including /nix directory
-	nix/scripts/purge.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-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-gems: export TARGET := fastlane
-nix-update-gems: ##@nix Update Ruby gems in fastlane/Gemfile.lock and fastlane/gemset.nix
-	fastlane/update.sh
-
-nix-update-pods: export TARGET := ios
-nix-update-pods: ##@nix Update CocoaPods in ios/Podfile.lock
-	cd ios && pod update
-
-#----------------
-# General targets
-#----------------
-
-_fix-node-perms: SHELL := /bin/sh
-_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
-	@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}
-
-pod-install: export TARGET := ios
-pod-install: ##@prepare Run 'pod install' to install podfiles and update Podfile.lock
-	cd ios && pod install; cd --
-
-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! /' \
-		> resources/config/fleets.json
-
-$(KEYSTORE_PATH): export TARGET := keytool
-$(KEYSTORE_PATH):
-	@./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
+release-android: export TARGET_OS ?= android
+release-android: ##@build build release for Android
+	@$(MAKE) prod-build-android && \
+	react-native run-android --variant=release
 
-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-ios: export TARGET_OS ?= ios
+release-ios: ##@build build release for iOS release
+	# Open XCode inside the Nix context
+	@$(MAKE) prod-build-ios && \
+	echo "Build in XCode, see https://status.im/build_status/ for instructions" && \
+	open ios/StatusIm.xcworkspace
 
-release-android: export TARGET := keytool
-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-desktop: export TARGET_OS ?= $(HOST_OS)
+release-desktop: ##@build build release for desktop release
+	@$(MAKE) prod-build-desktop && \
+	scripts/build-desktop.sh
 
-release-ios: export TARGET := ios
-release-ios: export IOS_STATUS_GO_TARGETS := ios/arm64
-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-windows-desktop: export TARGET_OS ?= windows
+release-windows-desktop: ##@build build release for desktop release
+	@$(MAKE) prod-build-desktop && \
+	scripts/build-desktop.sh
 
-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
+prod-build: export TARGET_OS ?= all
+prod-build:
+	scripts/prepare-for-platform.sh android && \
+	scripts/prepare-for-platform.sh ios && \
+	lein prod-build
+
+prod-build-android: export TARGET_OS ?= android
+prod-build-android:
+	lein prod-build-android
+
+prod-build-ios: export TARGET_OS ?= ios
+prod-build-ios:
+	lein prod-build-ios
+
+prod-build-desktop: export TARGET_OS ?= $(HOST_OS)
+prod-build-desktop:
+	git clean -qdxf -f ./index.desktop.js desktop/ && \
+	lein prod-build-desktop
 
 #--------------
-# status-go lib
-#--------------
+# 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_OS ?= ios
+watch-ios-real: _watch-ios-real ##@watch Start development for iOS real device
 
-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-ios-simulator: export TARGET_OS ?= ios
+watch-ios-simulator: _watch-ios-simulator ##@watch Start development for iOS simulator
+
+watch-android-real: export TARGET_OS ?= android
+watch-android-real: _watch-android-real ##@watch Start development for Android real device
+
+watch-android-avd: export TARGET_OS ?= android
+watch-android-avd: _watch-android-avd ##@watch Start development for Android AVD
+
+watch-android-genymotion: export TARGET_OS ?= android
+watch-android-genymotion: _watch-android-genymotion ##@watch Start development for Android Genymotion
+
+watch-desktop: export TARGET_OS ?= $(HOST_OS)
+watch-desktop: ##@watch Start development for Desktop
+	clj -R:dev build.clj watch --platform desktop
+
+desktop-server: export TARGET_OS ?= $(HOST_OS)
+desktop-server:
+	node ubuntu-server.js
 
 #--------------
-# Watch, Build & Review changes
-#--------------
+# Run
+# -------------
+_run-%:
+	$(eval SYSTEM := $(word 2, $(subst -, , $@)))
+	react-native run-$(SYSTEM)
 
-run-clojure: export TARGET := clojure
-run-clojure: ##@run Watch for and build Clojure changes for mobile
-	yarn shadow-cljs watch mobile
+run-android: export TARGET_OS ?= android
+run-android: ##@run Run Android build
+	react-native run-android --appIdSuffix debug
 
-run-metro: export TARGET := clojure
-run-metro: ##@run Start Metro to build React Native changes
-	@scripts/start-react-native.sh
+run-desktop: export TARGET_OS ?= $(HOST_OS)
+run-desktop: _run-desktop ##@run Run Desktop build
 
-run-re-frisk: export TARGET := clojure
-run-re-frisk: ##@run Start re-frisk server
-	yarn shadow-cljs run re-frisk-remote.core/start
-
-# TODO: Migrate this to a Nix recipe, much the same way as nix/mobile/android/targets/release-android.nix
-run-android: export TARGET := android
-# INFO: If it's empty (no devices attached, parsing issues, script error) - for Nix it's the same as not set.
-run-android: export ANDROID_ABI_INCLUDE ?= $(shell ./scripts/adb_devices_abis.sh)
-run-android: ##@run Build Android APK and start it on the device
-	npx react-native run-android --appIdSuffix debug
-
-SIMULATOR=iPhone 13
-run-ios: export TARGET := ios
-run-ios: export IOS_STATUS_GO_TARGETS := iossimulator/amd64
-run-ios: ##@run Build iOS app and start it in a simulator/device
+SIMULATOR=
+run-ios: export TARGET_OS ?= ios
+run-ios: ##@run Run iOS build
 ifneq ("$(SIMULATOR)", "")
-	npx react-native run-ios --simulator="$(SIMULATOR)"
+	react-native run-ios --simulator="$(SIMULATOR)"
 else
-	npx react-native run-ios
+	react-native run-ios
 endif
 
-show-ios-devices: ##@other shows connected ios device and its name
-	xcrun xctrace list devices
-
-run-ios-device: export TARGET := ios
-run-ios-device: export IOS_STATUS_GO_TARGETS := ios/arm64
-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 CLJ_LINTER_PRINT_WARNINGS ?= false
-lint: ##@test Run code style checks
-	@sh scripts/lint/re-frame-in-quo-components.sh && \
-	sh scripts/lint/direct-require-component-outside-quo.sh && \
-	sh scripts/lint/require-i18n-resource-first.sh && \
-	clj-kondo --config .clj-kondo/config.edn --cache false --fail-level error --lint src $(if $(filter $(CLJ_LINTER_PRINT_WARNINGS),true),,| grep -v ': warning: ') && \
-	ALL_CLOJURE_FILES=$(call find_all_clojure_files) && \
-	scripts/lint/translations.clj && \
-	zprint '{:search-config? true}' -sfc $$ALL_CLOJURE_FILES && \
-	sh scripts/lint/trailing-newline.sh && \
-	node_modules/.bin/prettier --write .
-
-# NOTE: We run the linter twice because of https://github.com/kkinnear/zprint/issues/271
-lint-fix: export TARGET := clojure
-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 && \
-	clojure-lsp --ns-exclude-regex ".*/src/status_im2/core\.cljs$$" clean-ns && \
-	sh scripts/lint/trailing-newline.sh --fix && \
-	node_modules/.bin/prettier --write .
-
-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: ##@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
 
-android-test: jsbundle
-android-test: export TARGET := android
-android-test:
-	cd android && ./gradlew test
-
-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
-	@@scripts/check-metro-shadow-process.sh
-	rm -rf ./component-spec
-	yarn install
-	nodemon --exec 'yarn shadow-cljs compile component-test && jest --config=test/jest/jest.config.js' -e cljs
-
-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
-	@scripts/check-metro-shadow-process.sh
-	rm -rf ./component-spec
-	yarn install
-	yarn shadow-cljs compile component-test && \
-	jest --config=test/jest/jest.config.js
+test-auto: ##@test Run tests in interactive (auto) mode in NodeJS
+	lein with-profile test doo node test
 
 #--------------
 # Other
 #--------------
+react-native-desktop: export TARGET_OS ?= $(HOST_OS)
+react-native-desktop: ##@other Start react native packager
+	@scripts/start-react-native.sh
 
-geth-connect: export TARGET := android-sdk
+react-native-android: export TARGET_OS ?= android
+react-native-android: ##@other Start react native packager for Android client
+	@scripts/start-react-native.sh
+
+react-native-ios: export TARGET_OS ?= ios
+react-native-ios: ##@other Start react native packager for Android client
+	@scripts/start-react-native.sh
+
+geth-connect: export TARGET_OS ?= android
 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
-
-android-ports: export TARGET := android-sdk
+android-ports: export TARGET_OS ?= android
 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: ##@other Invoke adb devices
-	adb devices
-
-android-logcat: export TARGET := android-sdk
-android-logcat: ##@other Read status-mobile 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 BUILD_TYPE ?= release
-android-install: ##@other Install APK on device using adb
-	adb install result/app-$(BUILD_TYPE).apk
+android-logcat: export TARGET_OS ?= android
+android-logcat:
+	adb logcat | grep -e StatusModule -e ReactNativeJS -e StatusNativeLogs
 
 _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-%:
+	$(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_OS ?= android
+startdev-android-avd: _startdev-android-avd
+startdev-android-genymotion: export TARGET_OS ?= android
+startdev-android-genymotion: _startdev-android-genymotion
+startdev-android-real: export TARGET_OS ?= android
+startdev-android-real: _startdev-android-real
+startdev-desktop: export TARGET_OS ?= $(HOST_OS)
+startdev-desktop: _startdev-desktop
+startdev-ios-real: export TARGET_OS ?= ios
+startdev-ios-real: _startdev-ios-real
+startdev-ios-simulator: export TARGET_OS ?= ios
+startdev-ios-simulator: _startdev-ios-simulator

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 middlemen and `go-ethereum` running directly on your device.
+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, and the way we conduct ourselves privately and promote this way of life to a mass audience.
+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 provide us with 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](http://get.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 the 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 and 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](http://get.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 checks 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](http://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**
-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)
+- **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://get.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,12 @@ 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](http://get.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)

STATUS_GO_OWNER

@@ -0,0 +1 @@
+status-im

STATUS_GO_SHA256

@@ -0,0 +1,3 @@
+## DO NOT EDIT THIS FILE BY HAND. USE `scripts/update-status-go.sh <tag>` instead
+
+0cj202bj2rwfrw327gibj8hj8i94ciyp3hkq2hck9l6711qlhpnb

STATUS_GO_VERSION

@@ -0,0 +1,3 @@
+## DO NOT EDIT THIS FILE BY HAND. USE `scripts/update-status-go.sh <tag>` instead
+
+v0.25.0-beta.0

VERSION

@@ -1 +0,0 @@
-1.25.0

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,95 +70,39 @@ 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",
     bundleInPr: true,
-    inputExcludes: ["android/**", "ios/**", "react-native/**", "src/**", "test/**"]
 ]
 
-// NOTE: Uncomment if building RN from a fork
-// configurations.all {
-//     exclude group: 'com.facebook.react', module: 'react-native'
-// }
-
 apply from: "../../node_modules/react-native/react.gradle"
 
+/**
+ * Set this to true to create two separate APKs instead of one:
+ *   - An APK that only works on ARM devices
+ *   - An APK that only works on x86 devices
+ * The advantage is the size of the APK is reduced by about 4MB.
+ * Upload all the APKs to the Play Store and people will download
+ * the correct one based on the CPU architecture of their device.
+ */
+def enableSeparateBuildPerCPUArchitecture = false
+
 /**
  * Run Proguard to shrink the Java bytecode in release builds.
  */
 def enableProguardInReleaseBuilds = false
 
-/**
- * The preferred build flavor of JavaScriptCore.
- *
- * For example, to use the international variant, you can use:
- * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
- *
- * The international variant includes ICU i18n library and necessary data
- * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
- * give correct results when using with locales other than en-US.  Note that
- * this variant is about 6MiB larger per architecture than default.
- */
-def jscFlavor = 'org.webkit:android-jsc:+'
-
-/**
- * Whether to enable the Hermes VM.
- *
- * This should be set on project.ext.react and mirrored here.  If it is not set
- * on project.ext.react, JavaScript will not be compiled to Hermes Bytecode
- * and the benefits of using Hermes will therefore be sharply reduced.
- */
-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")) {
-            return project.versionCode.toString().toInteger()
-        }
-
         exec {
-            commandLine "bash", "../../scripts/version/build_no.sh"
+            commandLine "bash", "../../scripts/build_no.sh"
             standardOutput = stdOut
             errorOutput = System.err
         }
@@ -168,14 +112,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,94 +136,26 @@ def getEnvOrConfig = { varName ->
 }
 
 android {
-    ndkVersion rootProject.ext.ndkVersion
-
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    compileSdkVersion 28
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
+
+
     defaultConfig {
         applicationId "im.status.ethereum"
-        minSdkVersion rootProject.ext.minSdkVersion
-        targetSdkVersion rootProject.ext.targetSdkVersion
+        minSdkVersion 23
+        targetSdkVersion 28
         multiDexEnabled true
         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"
-                }
-            }
+        ndk {
+            abiFilters "armeabi-v7a", "arm64-v8a", "x86", "x86-64"
         }
     }
-
-       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
@@ -300,15 +172,8 @@ android {
     packagingOptions {
         exclude 'META-INF/rxjava.properties'
         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'
-
+        exclude '/lib/arm64-v8a/**'
+        exclude '/lib/x86_64/**'
         /** Fix for: Execution failed for task ':app:transformNativeLibsWithStripDebugSymbolForDebug'.
         *   with recent version of ndk (17.0.4754217)
         */
@@ -319,20 +184,21 @@ android {
         jumboMode true
         javaMaxHeapSize "8g"
     }
+    signingConfigs {
+        release {
+            /* environment variables take precedence over gradle.properties file */
+            storeFile     file(getEnvOrConfig('STATUS_RELEASE_STORE_FILE').replaceAll("~", System.properties['user.home']))
+            storePassword getEnvOrConfig('STATUS_RELEASE_STORE_PASSWORD')
+            keyAlias      getEnvOrConfig('STATUS_RELEASE_KEY_ALIAS')
+            keyPassword   getEnvOrConfig('STATUS_RELEASE_KEY_PASSWORD')
+        }
+    }
     splits {
         abi {
             reset()
-            enable getEnvOrConfig('ANDROID_ABI_SPLIT').toBoolean()
-            include getEnvOrConfig('ANDROID_ABI_INCLUDE').split(";")
-            universalApk true
-        }
-    }
-    signingConfigs {
-        debug {
-            storeFile file('debug.keystore')
-            storePassword 'android'
-            keyAlias 'androiddebugkey'
-            keyPassword 'android'
+            enable enableSeparateBuildPerCPUArchitecture
+            universalApk false  // If true, also generate a universal APK
+            include "armeabi-v7a", "x86"
         }
     }
     buildTypes {
@@ -341,12 +207,11 @@ android {
             debuggable          true
             versionNameSuffix   "-SNAPSHOT"
             resValue "string", "build_config_package", "im.status.ethereum"
-            signingConfig signingConfigs.debug
         }
         release {
             minifyEnabled enableProguardInReleaseBuilds
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
-            signingConfig null
+            signingConfig signingConfigs.release
         }
         pr {
             initWith release
@@ -362,14 +227,13 @@ android {
     applicationVariants.all { variant ->
         variant.outputs.each { output ->
             // For each separate APK per architecture, set a unique version code as described here:
-
-            // https://developer.android.com/studio/build/configure-apk-splits.html
-            def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
+            // http://tools.android.com/tech-docs/new-build-system/user-guide/apk-splits
+            def versionCodes = ["armeabi-v7a":1, "x86":2, "arm64-v8a": 3, "x86-64": 4]
             def abi = output.getFilter(OutputFile.ABI)
             if (abi != null) {  // null for the universal-debug, universal-release variants
-                output.versionCodeOverride = versionCodes.get(abi) + defaultConfig.versionCode
+                output.versionCodeOverride =
+                        versionCodes.get(abi) * 1048576 + defaultConfig.versionCode
             }
-
         }
     }
 
@@ -380,97 +244,78 @@ android {
 
     sourceSets {
         main { jniLibs.srcDirs 'libs' }
+        main.assets.srcDirs += '../../resources/mapview'
     }
 }
 
+configurations.all {
+    exclude group: 'com.facebook.react', module: 'react-native'
+}
+
 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 {
-      implementation jscFlavor
-    }
-
-    // react-native-screens
-    implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02'
-
-    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-background-timer')
+    implementation project(':react-native-svg')
+    implementation 'com.android.support:multidex:1.0.2'
+    implementation project(':react-native-http-bridge')
+    implementation project(':react-native-splash-screen')
+    implementation project(':react-native-image-resizer')
     implementation project(':react-native-dialogs')
-    implementation project(':react-native-blur')
+    implementation project(':realm')
+    implementation fileTree(dir: "libs", include: ["*.jar"])
+    implementation "com.android.support:appcompat-v7:28.0.0"
+    implementation 'androidx.multidex:multidex:2.0.1' // only needed if minSdkVersion is less than 21 (https://developer.android.com/studio/build/multidex)
     // 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
     //compile ("com.facebook.react:react-native:0.55.4") { force = true }  // From node_modules
+    implementation project(':react-native-android')
+    implementation project(':react-native-languages')
     implementation project(':react-native-status')
+    implementation project(':react-native-fs')
+    implementation project(':react-native-image-crop-picker')
+    implementation project(':react-native-securerandom')
+    implementation project(':react-native-webview-bridge')
+    implementation project(':react-native-webview')
+    implementation project(':react-native-config')
+    implementation project(':react-native-firebase')
+    implementation project(':react-native-shake')
+    implementation project(':RNMail')
+    compile ('com.google.android.gms:play-services-base:16.0.1') {
+        force = true
+    }
+    compile (project(':react-native-camera')) {
+        exclude group: "com.google.android.gms"
+        compile 'com.android.support:exifinterface:28.+'
+    }
     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"
-}
+    implementation 'com.google.firebase:firebase-core:16.0.3' //this decides your firebase SDK version
+    implementation 'com.google.firebase:firebase-messaging:17.1.0'
+    implementation project(':react-native-keychain')
 
-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")
-        }
-    }
-}
-
-def getLocalNDKDir = { ->
-    def rootDir = project.rootDir
-    def localProperties = new File(rootDir, "local.properties")
-    if (!localProperties.exists()) {
-        return null
-    }
-    Properties properties = new Properties()
-    localProperties.withInputStream { instr ->
-        properties.load(instr)
-    }
-    return properties.getProperty('ndk.dir')
+    compile 'com.github.status-im:function:0.0.1'
+    implementation fileTree(dir: "node_modules/realm/android/libs", include: ["*.jar"])
+    implementation 'com.facebook.fresco:animated-gif:1.10.0'
 }
 
 // Run this once to be able to run the application with BUCK
 // 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
-    if (localNdkDir != null) {
-        ndkDir = localNdkDir
-    }
 
-    def execPath = "$ndkDir/ndk-build"
-    def exec = new File(execPath)
-    if (!exec.exists()) {
-        throw new GradleException("No ndk-build binary found!")
+task hemroidBuild(type: Exec) {
+    def rootDir = project.rootDir
+    def localProperties = new File(rootDir, "local.properties")
+
+    def ndkDir = "$System.env.ANDROID_NDK"
+    if (localProperties.exists()) {
+        Properties properties = new Properties()
+        localProperties.withInputStream { instr ->
+            properties.load(instr)
+        }
+        ndkDir = properties.getProperty('ndk.dir')
     }
-    executable execPath
+    executable "$ndkDir/ndk-build"
 }
 
 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"
-}
+// Must be at bottom to avoid dependency collision
+apply plugin: "com.google.gms.google-services"
+com.google.gms.googleservices.GoogleServicesPlugin.config.disableVersionCheck = true

android/app/google-services.json

@@ -0,0 +1,42 @@
+{
+  "project_info": {
+    "project_number": "854811651919",
+    "firebase_url": "https://status-react-app.firebaseio.com",
+    "project_id": "status-react-app",
+    "storage_bucket": "status-react-app.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:854811651919:android:11ee7444ded8a00a",
+        "android_client_info": {
+          "package_name": "im.status.ethereum"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "854811651919-gua52csicclb5p9gr4eeu33ukk0aaphj.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAOF4W1j8GYeXzzVKRfNKlXywD6bx0rJtQ"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

android/app/jni/Application.mk

@@ -1,5 +1,4 @@
 APP_ABI := armeabi-v7a arm64-v8a x86 x86_64
-APP_LDFLAGS := -Wl,--build-id=none
 APP_PLATFORM := android-18
 APP_STL := c++_static
 NDK_TOOLCHAIN_VERSION=clang

android/app/proguard-rules.pro

@@ -9,15 +9,19 @@
 
 # Add any project specific keep options here:
 
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
 # Disabling obfuscation is useful if you collect stack traces from production crashes
 # (unless you are using a system that supports de-obfuscate the stack traces).
 -dontobfuscate
 
 # 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
@@ -65,14 +69,6 @@
 -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 *;
-}
+# Firebase
+-keep class io.invertase.firebase.** { *; }
+-dontwarn io.invertase.firebase.**

android/app/react.gradle

@@ -0,0 +1,96 @@
+import org.apache.tools.ant.taskdefs.condition.Os
+
+def config = project.hasProperty("react") ? project.react : [];
+
+def bundleAssetName = config.bundleAssetName ?: "index.android.bundle"
+def entryFile = config.entryFile ?: "index.android.js"
+
+// because elvis operator
+def elvisFile(thing) {
+    return thing ? file(thing) : null;
+}
+
+def reactRoot = elvisFile(config.root) ?: file("../../")
+def inputExcludes = config.inputExcludes ?: ["android/**", "ios/**"]
+
+void runBefore(String dependentTaskName, Task task) {
+    Task dependentTask = tasks.findByPath(dependentTaskName);
+    if (dependentTask != null) {
+        dependentTask.dependsOn task
+    }
+}
+
+gradle.projectsEvaluated {
+    // Grab all build types and product flavors
+    def buildTypes = android.buildTypes.collect { type -> type.name }
+    def productFlavors = android.productFlavors.collect { flavor -> flavor.name }
+
+    // When no product flavors defined, use empty
+    if (!productFlavors) productFlavors.add('')
+
+    productFlavors.each { productFlavorName ->
+        buildTypes.each { buildTypeName ->
+            // Create variant and source names
+            def sourceName = "${buildTypeName}"
+            def targetName = "${sourceName.capitalize()}"
+            if (productFlavorName) {
+                sourceName = "${productFlavorName}${targetName}"
+            }
+
+            // React js bundle directories
+            def jsBundleDirConfigName = "jsBundleDir${targetName}"
+            def jsBundleDir = elvisFile(config."$jsBundleDirConfigName") ?:
+                    file("$buildDir/intermediates/assets/${sourceName}")
+
+            def resourcesDirConfigName = "jsBundleDir${targetName}"
+            def resourcesDir = elvisFile(config."${resourcesDirConfigName}") ?:
+                    file("$buildDir/intermediates/res/merged/${sourceName}")
+            def jsBundleFile = file("$jsBundleDir/$bundleAssetName")
+
+            // Bundle task name for variant
+            def bundleJsAndAssetsTaskName = "bundle${targetName}JsAndAssets"
+
+            def currentBundleTask = tasks.create(
+                    name: bundleJsAndAssetsTaskName,
+                    type: Exec) {
+                group = "react"
+                description = "bundle JS and assets for ${targetName}."
+
+                // Create dirs if they are not there (e.g. the "clean" task just ran)
+                doFirst {
+                    jsBundleDir.mkdirs()
+                    resourcesDir.mkdirs()
+                }
+
+                // Set up inputs and outputs so gradle can cache the result
+                inputs.files fileTree(dir: reactRoot, excludes: inputExcludes)
+                outputs.dir jsBundleDir
+                outputs.dir resourcesDir
+
+                // Set up the call to the react-native cli
+                workingDir reactRoot
+
+                // Set up dev mode
+                def devEnabled = !targetName.toLowerCase().contains("release")
+                if (Os.isFamily(Os.FAMILY_WINDOWS)) {
+                    commandLine "cmd", "/c", "react-native", "bundle", "--platform", "android", "--dev", "${devEnabled}",
+                            "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir
+                } else {
+                    commandLine "react-native", "bundle", "--platform", "android", "--dev", "${devEnabled}",
+                            "--entry-file", entryFile, "--bundle-output", jsBundleFile, "--assets-dest", resourcesDir
+                }
+
+                enabled config."bundleIn${targetName}" ?: targetName.toLowerCase().contains("release")
+            }
+
+            // Hook bundle${productFlavor}${buildType}JsAndAssets into the android build process
+            currentBundleTask.dependsOn("merge${targetName}Resources")
+            currentBundleTask.dependsOn("merge${targetName}Assets")
+
+            runBefore("processArmeabi-v7a${targetName}Resources", currentBundleTask)
+            runBefore("processX86${targetName}Resources", currentBundleTask)
+            runBefore("processUniversal${targetName}Resources", currentBundleTask)
+            runBefore("process${targetName}Resources", currentBundleTask)
+        }
+    }
+}

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/debug/google-services.json

@@ -0,0 +1,42 @@
+{
+  "project_info": {
+    "project_number": "854811651919",
+    "firebase_url": "https://status-react-app.firebaseio.com",
+    "project_id": "status-react-app",
+    "storage_bucket": "status-react-app.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:854811651919:android:11ee7444ded8a00a",
+        "android_client_info": {
+          "package_name": "im.status.ethereum.debug"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "854811651919-gua52csicclb5p9gr4eeu33ukk0aaphj.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAOF4W1j8GYeXzzVKRfNKlXywD6bx0rJtQ"
+        }
+      ],
+      "services": {
+        "analytics_service": {
+          "status": 1
+        },
+        "appinvite_service": {
+          "status": 1,
+          "other_platform_oauth_client": []
+        },
+        "ads_service": {
+          "status": 2
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

android/app/src/main/AndroidManifest.xml

@@ -4,7 +4,6 @@
           package="im.status.ethereum">
 
     <!-- non-dangerous permissions -->
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.NFC"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -17,35 +16,38 @@
     <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" />
+    <!-- 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"
-            android:requestLegacyExternalStorage="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">
+      <meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />
+      <meta-data
+        android:name="com.google.firebase.messaging.default_notification_icon"
+        android:resource="@drawable/ic_stat_status_notification" />
+
+        <meta-data
+                android:name="com.google.firebase.messaging.default_notification_channel_id"
+                android:value="@string/notification_channel_id" />
+
+
         <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"
                 android:resizeableActivity="false"
                 android:launchMode="singleTask">
             <intent-filter>
@@ -63,19 +65,29 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="http" android:host="status.app" />
-                <data android:scheme="https" android:host="status.app" />
+                <data android:scheme="http" android:host="get.status.im" />
+                <data android:scheme="https" android:host="get.status.im" />
             </intent-filter>
             <intent-filter android:autoVerify="true">
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="status-app" />
+                <data android:scheme="status-im" />
                 <data android:scheme="ethereum" />
             </intent-filter>
         </activity>
         <activity android:name="com.facebook.react.devsupport.DevSettingsActivity"/>
-        <service android:name="im.status.ethereum.pushnotifications.ForegroundService"></service>
+        <service android:name="io.invertase.firebase.messaging.RNFirebaseMessagingService">
+          <intent-filter>
+            <action android:name="com.google.firebase.MESSAGING_EVENT" />
+          </intent-filter>
+        </service>
+        <service android:name="io.invertase.firebase.messaging.RNFirebaseInstanceIdService">
+          <intent-filter>
+            <action android:name="com.google.firebase.INSTANCE_ID_EVENT"/>
+          </intent-filter>
+        </service>
+        <service android:name="io.invertase.firebase.messaging.RNFirebaseBackgroundMessagingService" />
         <provider
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"

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

@@ -21,30 +21,19 @@ 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.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 ReactActivity
         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 +93,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 +103,7 @@ public class MainActivity extends NavigationActivity
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
-        SplashScreen splashScreen = SplashScreen.installSplashScreen(this);
-        setTheme(R.style.DarkTheme);
+
         // Make sure we get an Alert for every uncaught exceptions
         registerUncaughtExceptionHandler(MainActivity.this);
 
@@ -134,9 +112,8 @@ public class MainActivity extends NavigationActivity
         Log.v("RNBootstrap", "Available system memory "+getAvailableMemory(activityManager).availMem + ", maximum usable application memory " + activityManager.getLargeMemoryClass()+"M");
 
         setSecureFlag();
-
-        // NOTE: Try to not restore the state https://github.com/software-mansion/react-native-screens/issues/17
-        super.onCreate(null);
+        SplashScreen.show(this, true);
+        super.onCreate(savedInstanceState);
 
         if (!shouldShowRootedNotification()) {
             configureStatus();
@@ -174,24 +151,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 +162,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 +183,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;
@@ -256,5 +225,9 @@ public class MainActivity extends NavigationActivity
         if (mPermissionListener != null && mPermissionListener.onRequestPermissionsResult(requestCode, permissions, grantResults)) {
             mPermissionListener = null;
         }
+        if (grantResults.length == 1 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+            // Permission has been granted. Start camera preview Activity.
+            com.github.alinz.reactnativewebviewbridge.WebViewBridgeManager.grantAccess(requestCode);
+        }
     }
 }

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

@@ -1,37 +1,46 @@
 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 com.facebook.react.PackageList;
 
 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.react.shell.MainReactPackage;
+import com.facebook.soloader.SoLoader;
+import com.github.alinz.reactnativewebviewbridge.WebViewBridgePackage;
+import com.reactnativecommunity.webview.RNCWebViewPackage;
+import com.horcrux.svg.SvgPackage;
+import com.lugg.ReactNativeConfig.ReactNativeConfigPackage;
+import com.oblador.keychain.KeychainPackage;
+import com.ocetnik.timer.BackgroundTimerPackage;
+import com.reactcommunity.rnlanguages.RNLanguagesPackage;
+import com.reactnative.ivpusic.imagepicker.PickerPackage;
+import com.rnfs.RNFSPackage;
 
+import net.rhogan.rnsecurerandom.RNSecureRandomPackage;
+
+import org.devio.rn.splashscreen.SplashScreenReactPackage;
+import org.reactnative.camera.RNCameraPackage;
+
+import java.util.Arrays;
 import java.util.List;
 
+import fr.bamlab.rnimageresizer.ImageResizerPackage;
+import im.status.ethereum.function.Function;
 import im.status.ethereum.keycard.RNStatusKeycardPackage;
 import im.status.ethereum.module.StatusPackage;
-import im.status.ethereum.pushnotifications.PushNotificationPackage;
-import im.status.ethereum.StatusOkHttpClientFactory;
+import io.invertase.firebase.RNFirebasePackage;
+import io.invertase.firebase.messaging.RNFirebaseMessagingPackage;
+import io.invertase.firebase.notifications.RNFirebaseNotificationsPackage;
+import io.realm.react.RealmReactPackage;
+import me.alwx.HttpServer.HttpServerReactPackage;
+import com.chirag.RNMail.*;
+import com.clipsub.RNShake.RNShakeEventPackage;
 
-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 +48,49 @@ 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;
+            Function<String, String> callRPC = statusPackage.getCallRPC();
+            return Arrays.asList(
+                    new MainReactPackage(),
+                    new RNMail(),
+                    new RNFirebasePackage(),
+                    new RNFirebaseMessagingPackage(),
+                    new RNFirebaseNotificationsPackage(),
+                    new RNSecureRandomPackage(),
+                    new BackgroundTimerPackage(),
+                    new SvgPackage(),
+                    new HttpServerReactPackage(),
+                    new SplashScreenReactPackage(),
+                    statusPackage,
+                    new RNStatusKeycardPackage(),
+                    new RealmReactPackage(),
+                    new RNLanguagesPackage(),
+                    new RNCameraPackage(),
+                    new RNFSPackage(),
+                    new ReactNativeDialogsPackage(),
+                    new ImageResizerPackage(),
+                    new PickerPackage(),
+                    new WebViewBridgePackage(BuildConfig.DEBUG_WEBVIEW == "1", callRPC),
+                    new RNCWebViewPackage(),
+                    new ReactNativeConfigPackage(),
+                    new KeychainPackage(),
+                    new RNShakeEventPackage());
         }
 
         @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,95 +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 = getCertificatePem();
-      } catch(Exception e) {
-          Log.e(TAG, "Could not getImageTLSCert",e);
-      }
-
-      if (certPem.isEmpty()) {
-          Log.e(TAG, "Certificate is empty, cannot create OkHttpClient without a valid certificate");
-          return null;
-      }
-
-      // 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;
-    }
-  }
-    private String getCertificatePem() {
-        try {
-            String certPem = StatusPackage.getImageTLSCert();
-            if (certPem == null || certPem.trim().isEmpty()) {
-                Log.e(TAG, "Certificate PEM string is null or empty");
-                return "";
-            }
-            return certPem;
-        } catch (Exception e) {
-            Log.e(TAG, "Could not getImageTLSCert", e);
-            return "";
-        }
-    }
-}

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();
-  });
-}