Changed tests run

ci: fix nix sandbox filename by adding random string
By using just the timestamp we increase the probability of hitting a race condition with another build due to same filename of sandbox file. Depends on: https://github.com/status-im/status-jenkins-lib/pull/40 Signed-off-by: Jakub Sokołowski <jakub@status.im>
2022-05-01 05:06:31 +03:00 · 2022-04-27 15:07:26 +04:00 · 2022-04-27 11:57:19 +04:00 · 2022-04-26 12:59:47 +01:00 · 2022-04-25 16:36:03 +03:00 · 2022-04-25 11:18:18 +02:00
3496 changed files with 137871 additions and 116331 deletions
@@ -0,0 +1,236 @@
+status-im.utils.build/warning-handler
+status-im.utils.build/get-current-sha
+status-im.chat.constants/spacing-char
+status-im.chat.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
+status-im.native-module.core/listener
+status-im.native-module.core/multiaccount-reset
+status-im.native-module.core/extract-group-membership-signatures
+status-im.native-module.core/sign-group-membership
+status-im.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-im.utils.config/rpc-networks-only?
+status-im.utils.config/waku-enabled?
+status-im.utils.pairing/has-paired-installations?
+status-im.tribute-to-talk.core-test/user-cofx
+quo.gesture-handler/tap-gesture-handler
+quo.gesture-handler/pan-gesture-handler
+quo.gesture-handler/long-press-gesture-handler
+quo.gesture-handler/pure-native-button
+quo.gesture-handler/createNativeWrapper
+quo.gesture-handler/animated-raw-button
+quo.gesture-handler/states
+mocks.js-dependencies/action-button
+mocks.js-dependencies/camera
+mocks.js-dependencies/dismiss-keyboard
+mocks.js-dependencies/emoji-picker
+mocks.js-dependencies/i18n
+mocks.js-dependencies/qr-code
+mocks.js-dependencies/svg
+mocks.js-dependencies/icons
+mocks.js-dependencies/webview
+mocks.js-dependencies/desktop-linking
+mocks.js-dependencies/desktop-shortcuts
+mocks.js-dependencies/snoopy
+mocks.js-dependencies/snoopy-filter
+mocks.js-dependencies/snoopy-bars
+mocks.js-dependencies/snoopy-buffer
+mocks.js-dependencies/desktop-menu
+mocks.js-dependencies/desktop-config
+mocks.js-dependencies/react-native-navigation-twopane
+mocks.js-dependencies/react-native-screens
+mocks.js-dependencies/react-native-shake
+mocks.js-dependencies/back-handler
+mocks.js-dependencies/react
+mocks.js-dependencies/react-navigation-native
+mocks.js-dependencies/react-navigation-stack
+mocks.js-dependencies/react-navigation-bottom-tabs
+mocks.js-dependencies/react-native-haptic-feedback
+mocks.js-dependencies/mock
+quo.previews.main/init
+status-im.chat.models.message-list-test/descending-range
+status-im.chat.models.message-list-test/random-range
+status-im.ethereum.eip165/supports?
+status-im.utils.hex/valid-hex?
+status-im.multiaccounts.core/chat-send?
+status-im.hardwallet.simulated-keycard/install-cash-applet
+status-im.hardwallet.simulated-keycard/sign-typed-data
+status-im.utils.core/safe-read-message-content
+status-im.ui.components.react/native-modules
+status-im.ui.components.react/progress-bar
+status-im.utils.fs/move-file
+status-im.utils.fs/read-dir
+status-im.utils.fs/mkdir
+status-im.utils.fs/unlink
+status-im.utils.fs/file-exists?
+quo.animated/code
+quo.animated/eq
+quo.animated/neq
+quo.animated/greater-or-eq
+quo.animated/not*
+quo.animated/or*
+quo.animated/and*
+quo.animated/add
+quo.animated/sub
+quo.animated/multiply
+quo.animated/abs
+quo.animated/min*
+quo.animated/max*
+quo.animated/set
+quo.animated/start-clock
+quo.animated/stop-clock
+quo.animated/bezier
+quo.animated/linear
+quo.animated/set-value
+quo.animated/clock
+quo.animated/debug
+quo.animated/log
+quo.animated/event
+quo.animated/on-change
+quo.animated/cond*
+quo.animated/block
+quo.animated/call*
+quo.animated/timing
+quo.animated/spring
+quo.animated/clamp
+quo.animated/with-spring
+quo.animated/with-timing
+quo.animated/re-timing
+quo.design-system.colors/white
+quo.design-system.colors/black
+status-im.transport.core-test/messages
+status-im.ethereum.core/sidechain?
+status-im.ethereum.core/network-with-upstream-rpc?
+status-im.ethereum.core/current-address
+status-im.ethereum.core/network->network-name
+status-im.ethereum.core/estimate-gas
+quo.core/animated-header
+quo.core/safe-area-provider
+quo.core/safe-area-consumer
+quo.core/safe-area-view
+status-im.utils.universal-links.core/open!
+status-im.transport.filters.core-test/member-2
+status-im.ui.screens.chat.ttt/one-to-one-chat-description-container
+status-im.ethereum.ens/ttl
+status-im.ethereum.ens/addr-hash
+status-im.ethereum.ens/name-hash
+status-im.ethereum.ens/ABI-hash
+status-im.ethereum.ens/pubkey-hash
+status-im.network.core/get-network
+status-im.constants/desktop-content-types
+status-im.constants/blocks-per-hour
+status-im.constants/one-earth-day
+status-im.constants/left-pane-min-width
+status-im.constants/system
+status-im.constants/contact-discovery
+status-im.constants/send-transaction-failed-parse-response
+status-im.constants/send-transaction-failed-parse-params
+status-im.constants/send-transaction-no-account-selected
+status-im.constants/send-transaction-invalid-tx-sender
+status-im.constants/web3-get-logs
+status-im.constants/web3-transaction-receipt
+status-im.constants/web3-new-filter
+status-im.constants/web3-new-pending-transaction-filter
+status-im.constants/web3-new-block-filter
+status-im.constants/web3-uninstall-filter
+status-im.constants/web3-get-filter-changes
+status-im.constants/web3-shh-post
+status-im.constants/web3-shh-new-identity
+status-im.constants/web3-shh-has-identity
+status-im.constants/web3-shh-new-group
+status-im.constants/web3-shh-add-to-group
+status-im.constants/web3-shh-new-filter
+status-im.constants/web3-shh-uninstall-filter
+status-im.constants/web3-shh-get-filter-changes
+status-im.constants/web3-shh-get-messages
+status-im.constants/status-create-address
+status-im.constants/event-transfer-hash
+status-im.constants/regx-rtl-characters
+status-im.constants/desktop-msg-chars-hard-limit
+status-im.constants/debug-metrics
+status-im.constants/scan-qr-code
+status-im.constants/ipfs-proto-code
+status-im.constants/swarm-proto-code
+status-im.multiaccounts.update.publisher/publish-update!
+status-im.utils.async/task-queue
+status-im.utils.async/async-periodic-run!
+status-im.desktop.core/app-root
+status-im.desktop.core/init
+status-im.chat.models-test/test-db
+quo.design-system.spacing/padding-vertical
+status-im.utils.money/percent-change
+status-im.utils.platform/isMacOs?
+status-im.utils.platform/isNix?
+status-im.utils.platform/isWin?
+status-im.utils.platform/android-version>=
+status-im.utils.debounce/clear-all
+status-im.transport.db/create-chat
+status-im.utils.priority-map/priority-map
+status-im.utils.priority-map/priority-map-by
+status-im.utils.priority-map/priority-map-keyfn
+status-im.utils.priority-map/empty-message-map
+status-im.wallet.choose-recipient.core/use-default-eth-gas
+status-im.ui.components.animation/decay
+status-im.ui.components.animation/remove-all-listeners
+status-im.ui.components.animation/stop-animation
+status-im.ui.components.animation/animated
+status-im.ui.components.animation/add
+status-im.ui.components.animation/subtract
+status-im.ui.components.animation/get-layout
+status-im.wallet.transactions-test/uri-query-data
+quo.react-native/touchable-highlight
+status-im.utils.name/shortened-name
+status-im.ui.components.button.haptic/trigger
+status-im.contact.db/filter-dapps
+status-im.contact.db/filter-group-contacts
+status-im.contact.db/legacy-pending?
+status-im.utils.transducers-test/preview-call-1
+status-im.utils.transducers-test/preview-call-2
+status-im.utils.types/to-string
+status-im.chat.db/datemark?
+status-im.chat.db/gap?
+status-im.chat.db/map->sorted-seq
+status-im.utils.snoopy/status-module-filter
+status-im.utils.snoopy/websocket-filter
+status-im.utils.snoopy/touches-filter
+status-im.utils.snoopy/native-animation-filter
+status-im.utils.snoopy/keyboard-observer-filter
+status-im.utils.multihash/hex
+status-im.utils.multihash/decode-array
@@ -1,6 +1,13 @@
-{:lint-as {status-im.utils.views/defview clojure.core/defn
-           status-im.utils.views/letsubs clojure.core/let
-           status-im.utils.fx/defn       clojure.core/defn
-           status-im.utils.styles/def    clojure.core/def
-           status-im.utils.styles/defn   clojure.core/defn}
- :linters {:invalid-arity {:skip-args [status-im.utils.fx/defn]}}}
+{:lint-as {status-im.utils.views/defview  clojure.core/defn
+           status-im.utils.views/letsubs  clojure.core/let
+           reagent.core/with-let          clojkure.core/let
+           status-im.utils.fx/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
+           taoensso.tufte/defnp           clojure.core/defn}
+ :linters {:invalid-arity     {:skip-args [status-im.utils.fx/defn]}
+           ;;TODO remove number when this is fixed
+           ;;https://github.com/borkdude/clj-kondo/issues/867
+           :unresolved-symbol {:exclude [PersistentPriorityMap.EMPTY number]}}}
@@ -13,7 +13,7 @@ update_configs:
          update_type: "security"
  # Keep /mobile/js_files/yarn.lock up to date, batching pull requests weekly
  - package_manager: "javascript"
-    directory: "/mobile/js_files"
+    directory: "/"
    update_schedule: "weekly"
    allowed_updates:
    - match:
@@ -7,9 +7,7 @@ ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
 FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
-HARDWALLET_ENABLED=1
-LOG_LEVEL_STATUS_GO=info
-LOG_LEVEL=debug
+LOG_LEVEL=info
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
 PFS_TOGGLE_VISIBLE=1
@@ -19,6 +17,20 @@ SNOOPY=0
 RPC_NETWORKS_ONLY=0
 PARTITIONED_TOPIC=0
 CONTRACT_NODES=1
-MOBILE_UI_FOR_DESKTOP=1
 STATUS_GO_PROTOCOL=0
 STATUS_GO_ENABLE_NIMBUS=0
+KEYCARD_TEST_MENU=0
+QR_READ_TEST_MENU=1
+ENABLE_ROOT_ALERT=1
+ENABLE_REFERRAL_INVITE=1
+ENABLE_QUO_PREVIEW=1
+MAX_IMAGES_BATCH=5
+APN_TOPIC=im.status.ethereum.pr
+COMMUNITIES_ENABLED=1
+DATABASE_MANAGEMENT_ENABLED=1
+METRICS_ENABLED=0
+DELETE_MESSAGE_ENABLED=1
+COLLECTIBLES_ENABLED=1
+COMMANDS_ENABLED=1
+TWO_MINUTES_SYNCING=1
+SWAP_ENABLED=1
@@ -3,10 +3,9 @@ DEFAULT_NETWORK=testnet_rpc
 ERC20_CONTRACT_WARNINGS=1
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=eth.prod
+FLEET=eth.staging
 GROUP_CHATS_ENABLED=1
-LOG_LEVEL_STATUS_GO=info
-LOG_LEVEL=debug
+LOG_LEVEL=info
 MAILSERVER_CONFIRMATIONS_ENABLED=0
 PAIRING_POPUP_DISABLED=1
 PFS_ENCRYPTION_ENABLED=1
@@ -17,7 +16,21 @@ SNOOPY=0
 STICKERS_ENABLED=1
 PARTITIONED_TOPIC=0
 CONTRACT_NODES=1
-MOBILE_UI_FOR_DESKTOP=1
 BLANK_PREVIEW=0
 TOOLTIP_EVENTS=1
 COMMANDS_ENABLED=1
+KEYCARD_TEST_MENU=1
+QR_READ_TEST_MENU=1
+ENABLE_ROOT_ALERT=0
+ENABLE_REFERRAL_INVITE=1
+MAX_IMAGES_BATCH=5
+APN_TOPIC=im.status.ethereum.pr
+VERIFY_TRANSACTION_CHAIN_ID=3
+VERIFY_ENS_CHAIN_ID=3
+TEST_STATEOFUS=1
+DATABASE_MANAGEMENT_ENABLED=1
+COMMUNITIES_ENABLED=1
+COMMUNITIES_MANAGEMENT_ENABLED=1
+METRICS_ENABLED=0
+DELETE_MESSAGE_ENABLED=1
+TWO_MINUTES_SYNCING=1
@@ -1,14 +1,12 @@
 CACHED_WEBVIEWS_ENABLED=1
 DEBUG_WEBVIEW=1
-DEFAULT_NETWORK=mainnet_rpc
+DEFAULT_NETWORK=testnet_rpc
 ERC20_CONTRACT_WARNINGS=0
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
 FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
-HARDWALLET_ENABLED=1
-LOG_LEVEL_STATUS_GO=info
-LOG_LEVEL=debug
+LOG_LEVEL=info
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 MAINNET_WARNING_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
@@ -19,5 +17,23 @@ SNOOPY=0
 RPC_NETWORKS_ONLY=0
 PARTITIONED_TOPIC=0
 CONTRACT_NODES=1
-MOBILE_UI_FOR_DESKTOP=1
 STATUS_GO_ENABLE_NIMBUS=0
+COMMANDS_ENABLED=1
+KEYCARD_TEST_MENU=0
+ENABLE_ROOT_ALERT=1
+ENABLE_REFERRAL_INVITE=1
+DISABLE_WALLET_ON_MOBILE_NETWORK=1
+APN_TOPIC=im.status.ethereum.pr
+VERIFY_TRANSACTION_CHAIN_ID=3
+VERIFY_ENS_CHAIN_ID=3
+TEST_STATEOFUS=1
+BLANK_PREVIEW=0
+MAX_IMAGES_BATCH=5
+GOOGLE_FREE=0
+DATABASE_MANAGEMENT_ENABLED=1
+COMMUNITIES_ENABLED=1
+COMMUNITIES_MANAGEMENT_ENABLED=1
+METRICS_ENABLED=0
+DELETE_MESSAGE_ENABLED=1
+TWO_MINUTES_SYNCING=1
+ENABLE_QUO_PREVIEW=1
@@ -5,8 +5,7 @@ ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
 FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
-LOG_LEVEL_STATUS_GO=info
-LOG_LEVEL=debug
+LOG_LEVEL=info
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 MAINNET_WARNING_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
@@ -17,5 +16,11 @@ SNOOPY=0
 RPC_NETWORKS_ONLY=0
 PARTITIONED_TOPIC=0
 CONTRACT_NODES=1
-MOBILE_UI_FOR_DESKTOP=1
-HARDWALLET_ENABLED=1
+ENABLE_ROOT_ALERT=1
+ENABLE_REFERRAL_INVITE=0
+MAX_IMAGES_BATCH=5
+BLANK_PREVIEW=0
+COMMUNITIES_ENABLED=1
+DATABASE_MANAGEMENT_ENABLED=1
+METRICS_ENABLED=0
+DELETE_MESSAGE_ENABLED=1
@@ -4,9 +4,8 @@ ERC20_CONTRACT_WARNINGS=0
 ETHEREUM_DEV_CLUSTER=0
 EXTENSIONS=0
 FLEET=eth.prod
-GROUP_CHATS_ENABLED=0
-LOG_LEVEL_STATUS_GO=
-LOG_LEVEL=info
+GROUP_CHATS_ENABLED=1
+LOG_LEVEL=
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 MAINNET_WARNING_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
@@ -16,5 +15,9 @@ POW_TIME=1
 SNOOPY=0
 RPC_NETWORKS_ONLY=1
 PARTITIONED_TOPIC=0
-MOBILE_UI_FOR_DESKTOP=1
-LOCAL_NOTIFICATIONS=0
+ENABLE_ROOT_ALERT=1
+MAX_IMAGES_BATCH=1
+ENABLE_REFERRAL_INVITE=0
+METRICS_ENABLED=0
+DELETE_MESSAGE_ENABLED=1
+COLLECTIBLES_ENABLED=1
@@ -94,4 +94,4 @@ suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(<VERSION>\\)? *\\(site=[a-z,_]*
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy

 [version]
-^0.105.0
+^0.122.0
@@ -5,8 +5,6 @@
 # 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
@@ -24,12 +22,4 @@

 /components @status-im/status-core-ui

-desktop/                        @vkjr
-modules/react-native-desktop*/  @vkjr
-modules/react-native-desktop*/  @vkjr
-
-/doc        @oskarth @yenda @jeluard
-
-/deployment @vkjr
-
-/test/appium/    @antdanchenko @churik
+/test/appium/ @churik
@@ -8,10 +8,9 @@ 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 Core Values](https://status.im/contribute)
-* [Principles](https://status.im/contribute/our_principles.html)
+* [Mission and Principles](https://status.im/about)
 * [Read our FAQ](https://status.im/docs/FAQs.html)
 * [Join our Chat](http://join.status.im/chat/public/status-core-dev)
 * [Developer Introduction](https://status.im/developer_tools/)
-* [Build Status Yourself](https://status.im/build_status)
+* [Build Status Yourself](https://status.im/technical/build_status)
 * [Find issues to work on](https://github.com/status-im/)
@@ -9,46 +9,27 @@ assignees: ''

 # Bug Report

-## Problem

-An overview of the background required to understand the problem.
-A problem description.
+## Problem 
+[comment]: # (A problem description)
+

 #### Expected behavior

-[comment]: # (Describe what you expected to happen. Please include designs if possible.)

 #### Actual behavior

-[comment]: # (Describe what actually happened. Please include screenshots if possible.)
-
-#### Notes
-
-For the developer who will be investigating. Is it related to another PR? Tips on where to start? 
-
-#### Acceptance Criteria
-
-Rules for the future PR to be accepted.

 ### Reproduction

-[comment]: # (Describe how we can replicate the bug step by step.)
-
- Open Status
- ...
- Step 3, etc.
+1) Open Status
+2) 

 ### Additional Information

-[comment]: # (Please do your best to fill this out.)
- Status version: ...
-[comment]: # (Android or iOS.)
- Operating System: <Android|iOS>
+- Status version: nightly 
+- Operating System: Android, iOS

-#### Logs

-[comment]: # (if on Android please replicate bug whilst running adb logcat)
+[comment]: # (Please, add logs/notes if necessary)

-```
-...
-```
@@ -0,0 +1,77 @@
+---
+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-react/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-react/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-react/blob/develop/doc/RELEASE_GUIDE.md), bump VERSION (merge created PR ([example](https://github.com/status-im/status-react/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-react/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-react/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-react/releases (Jakub)
+- [ ] 5. Merge PR for updating [RELEASES.md](https://github.com/status-im/status-react/blob/develop/RELEASES.md) (from 1.3 step)
+
@@ -10,20 +10,8 @@ project-board:

 automated-tests:
  repo-full-name: 'status-im/status-react'
-  job-full-name: 'end-to-end-tests/status-app-prs'
+  job-full-name: 'status-react/e2e/status-app-prs'
  kickoff-column-name: 'E2E Tests'

 github-team:
  slug: 'clojure'
-
-prchecklist:
-  title: Pull Request Checklist
-  checklist:
-    - '**Docs**: Updated the [documentation](https://status.im/build_status/), if affected'
-    - '**Docs**: Added or updated inline comments explaining intention of the code'
-    - '**Tests**: Ensured that all new UI elements have been assigned accessibility IDs'
-    - '**Tests**: Signaled need for E2E tests with label, if applicable'
-    - '**Tests**: Briefly described what was tested and what platforms were used'
-    - '**UI**: In case of UI changes, ensured that UI matches [Figma](https://www.figma.com/)'
-    - '**UI**: In case of UI changes, requested review from a Core UI designer'
-    - '**UI**: In case of UI changes, included screenshots of implementation'
@@ -0,0 +1,17 @@
+name: Zenhub integration assigned
+on:
+  issues:
+    types:
+      - assigned
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: status-im/zenhub-automations@master
+        with:
+          GITHUB_TOKEN:  ${{ secrets.GITHUB_TOKEN }}
+          ZENHUB_API_KEY: ${{ secrets.ZENHUB_TOKEN }}
+          INPROG_COLUMN: Z2lkOi8vcmFwdG9yL1BpcGVsaW5lLzMyODI1Mg
+          NEXT_COLUMN: Z2lkOi8vcmFwdG9yL1BpcGVsaW5lLzMyNzk2MQ
+          REVIEW_COLUMN: Z2lkOi8vcmFwdG9yL1BpcGVsaW5lLzIyNjk0MTA
@@ -0,0 +1,15 @@
+name: Zenhub integration branch
+on:
+  create:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: status-im/zenhub-automations@master
+        with:
+          GITHUB_TOKEN:  ${{ secrets.GITHUB_TOKEN }}
+          ZENHUB_API_KEY: ${{ secrets.ZENHUB_TOKEN }}
+          INPROG_COLUMN: Z2lkOi8vcmFwdG9yL1BpcGVsaW5lLzMyODI1Mg
+          NEXT_COLUMN: Z2lkOi8vcmFwdG9yL1BpcGVsaW5lLzMyNzk2MQ
+          REVIEW_COLUMN: Z2lkOi8vcmFwdG9yL1BpcGVsaW5lLzIyNjk0MTA
@@ -0,0 +1,17 @@
+name: Zenhub integration milestoned
+on:
+  issues:
+    types:
+      - milestoned
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: status-im/zenhub-automations@master
+        with:
+          GITHUB_TOKEN:  ${{ secrets.GITHUB_TOKEN }}
+          ZENHUB_API_KEY: ${{ secrets.ZENHUB_TOKEN }}
+          INPROG_COLUMN: Z2lkOi8vcmFwdG9yL1BpcGVsaW5lLzMyODI1Mg
+          NEXT_COLUMN: Z2lkOi8vcmFwdG9yL1BpcGVsaW5lLzMyNzk2MQ
+          REVIEW_COLUMN: Z2lkOi8vcmFwdG9yL1BpcGVsaW5lLzIyNjk0MTA
@@ -0,0 +1,20 @@
+name: Zenhub integration PR
+on:
+  pull_request:
+    branches: [ develop ]
+    types:
+      - ready_for_review
+      - opened
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: status-im/zenhub-automations@master
+        if: github.event.pull_request.draft == false
+        with:
+          GITHUB_TOKEN:  ${{ secrets.GITHUB_TOKEN }}
+          ZENHUB_API_KEY: ${{ secrets.ZENHUB_TOKEN }}
+          INPROG_COLUMN: Z2lkOi8vcmFwdG9yL1BpcGVsaW5lLzMyODI1Mg
+          NEXT_COLUMN: Z2lkOi8vcmFwdG9yL1BpcGVsaW5lLzMyNzk2MQ
+          REVIEW_COLUMN: Z2lkOi8vcmFwdG9yL1BpcGVsaW5lLzIyNjk0MTA
@@ -25,7 +25,6 @@ DerivedData
 *.ipa
 *.xcuserstate
 project.xcworkspace
-xcshareddata

 # Android/IJ
 #
@@ -68,9 +67,6 @@ env/dev/env/config.cljs
 externs/
 shim.js

-# Desktop build
-index.desktop.js
-
 # Generated by lein voom
 #
 /pom.xml
@@ -86,6 +82,9 @@ figwheel_server.log
 .lein-failures
 .lein-repl-history

+# Shadow
+.shadow-cljs
+
 ## Doo
 #
 out
@@ -100,6 +99,8 @@ Statusgo.framework
 #ios
 /ios/Pods/
 /ios/StatusIm.xcworkspace
+/ios/react-native-xcode.log
+/ios/set_xcode_version.log
 .ruby-version
 status-e2e/

@@ -124,11 +125,8 @@ fastlane/README.md
 # emacs
 .dir-locals.el

-#ignore platform-specific files in the root since they are only symlinks to files in folders 'desktop/js_files' and 'mobile/js_files'
+# We don't use NPM
 /package-lock.json
-/package.json
-/metro.config.js
-/yarn.lock
 /.re-natal
 /re-natal

@@ -136,27 +134,6 @@ 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.*
@@ -184,4 +161,12 @@ status-modules/resources
 /fiddle/target/
 /fiddle/resources/public/images/

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

 help: SHELL := /bin/sh
 help: ##@other Show this help
@@ -16,7 +16,7 @@ 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\n"; \
+		   print "Usage: make [target]\n\nSee STARTING_GUIDE.md for more info.\n\n"; \
 		   for (sort keys %help) { \
 			   print "${WHITE}$$_:${RESET}\n"; \
 			   for (@{$$help{$$_}}) { \
@@ -39,16 +39,10 @@ export REACT_SERVER_PORT ?= 5001

 # Our custom config is located in nix/nix.conf
 export NIX_CONF_DIR = $(PWD)/nix
+# Location of symlinks to derivations that should not be garbage collected
+export _NIX_GCROOTS = /nix/var/nix/gcroots/per-user/$(USER)/status-react
 # Defines which variables will be kept for Nix pure shell, use semicolon as divider
-export _NIX_KEEP ?= TMPDIR,BUILD_ENV,STATUS_GO_SRC_OVERRIDE,NIMBUS_SRC_OVERRIDE
-export _NIX_ROOT = /nix
-# legacy TARGET_OS variable support
-ifdef TARGET_OS
-export TARGET ?= $(TARGET_OS)
-endif
-
-# Useful for checking if we are on NixOS
-OS_NAME := $(shell awk -F= '/^NAME/{print $2}' /etc/os-release)
+export _NIX_KEEP ?= TMPDIR,BUILD_ENV,STATUS_GO_SRC_OVERRIDE

 # Useful for Andoird release builds
 TMP_BUILD_NUMBER := $(shell ./scripts/version/gen_build_no.sh | cut -c1-10)
@@ -57,20 +51,16 @@ TMP_BUILD_NUMBER := $(shell ./scripts/version/gen_build_no.sh | cut -c1-10)
 UNAME_S := $(shell uname -s)
 ifeq ($(UNAME_S),Darwin)
 export NIX_IGNORE_SYMLINK_STORE=1
-export _NIX_ROOT = /opt/nix
 endif

 #----------------
 # Nix targets
 #----------------

-# WARNING: This has to be located right before the targets
-ifdef IN_NIX_SHELL
-SHELL := env bash
-else
+# WARNING: This has to be located right before all the targets.
 SHELL := ./nix/scripts/shell.sh
-endif

+shell: export TARGET ?= default
 shell: ##@prepare Enter into a pre-configured shell
 ifndef IN_NIX_SHELL
 	@ENTER_NIX_SHELL
@@ -78,32 +68,36 @@ else
 	@echo "${YELLOW}Nix shell is already active$(RESET)"
 endif

-nix-gc: ##@nix Garbage collect all packages older than 20 days from /nix/store
-	nix-collect-garbage --delete-old --delete-older-than 20d
+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-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-react build artifacts from /nix/store
 	nix/scripts/clean.sh

 nix-purge: SHELL := /bin/sh
-nix-purge: ##@nix Completely remove the complete Nix setup
-ifeq ($(OS_NAME), NixOS)
-	$(error $(RED)You should not purge Nix files on NixOS!$(RESET))
-else
-	sudo rm -rf $(_NIX_ROOT)/* ~/.nix-profile ~/.nix-defexpr ~/.nix-channels ~/.cache/nix ~/.status .nix-gcroots
-endif
-
-nix-add-gcroots: export TARGET := default
-nix-add-gcroots: ##@nix Add Nix GC roots to avoid status-react expressions being garbage collected
-	nix/scripts/gcroots.sh
+nix-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/mobile/android/maven-and-npm-deps/maven/generate-nix.sh
+	nix/deps/gradle/generate.sh

-nix-update-lein: export TARGET := lein
-nix-update-lein: ##@nix Update maven nix expressions based on current lein setup
-	nix/tools/lein/generate-nix.sh nix/lein
+nix-update-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 := lein
+nix-update-gems: export TARGET := default
 nix-update-gems: ##@nix Update Ruby gems in fastlane/Gemfile.lock and fastlane/gemset.nix
 	fastlane/update.sh

@@ -130,22 +124,26 @@ _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_REACT_HOME}

-disable-githooks: SHELL := /bin/sh
-disable-githooks: ##@prepare Disables lein githooks
-	@rm -f ${env.WORKSPACE}/.git/hooks/pre-commit && \
-	sed -i'~' -e 's|\[rasom/lein-githooks|;; [rasom/lein-githooks|' \
-		-e 's|:githooks|;; :githooks|' \
-		-e 's|:pre-commit|;; :pre-commit|' project.clj; \
-	rm project.clj~
-
 pod-install: export TARGET := ios
 pod-install: ##@prepare Run 'pod install' to install podfiles and update Podfile.lock
 	cd ios && pod install; cd --
@@ -160,125 +158,114 @@ keystore: export KEYSTORE_PATH ?= $(HOME)/.gradle/status-im.keystore
 keystore: ##@prepare Generate a Keystore for signing Android APKs
 	@./scripts/generate-keystore.sh

+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
+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

-release-android: export TARGET := android
 release-android: export BUILD_ENV ?= prod
 release-android: export BUILD_TYPE ?= nightly
 release-android: export BUILD_NUMBER ?= $(TMP_BUILD_NUMBER)
 release-android: export KEYSTORE_PATH ?= $(HOME)/.gradle/status-im.keystore
+release-android: export ANDROID_APK_SIGNED ?= true
 release-android: export ANDROID_ABI_SPLIT ?= false
 release-android: export ANDROID_ABI_INCLUDE ?= armeabi-v7a;arm64-v8a;x86
-release-android: keystore ##@build build release for Android
+release-android: keystore ##@build Build release for Android
 	scripts/release-android.sh

-release-ios: export TARGET ?= ios
+release-fdroid: export BUILD_ENV = prod
+release-fdroid: export BUILD_TYPE = release
+release-fdroid: export ANDROID_APK_SIGNED = false
+release-fdroid: export ANDROID_ABI_SPLIT = false
+release-fdroid: export ANDROID_ABI_INCLUDE = armeabi-v7a;arm64-v8a;x86;x86_64
+release-fdroid: export READER_FEATURES = google-free
+release-fdroid: ##@build Build release for F-Droid
+	scripts/google-free.sh
+	scripts/release-android.sh
+
+release-ios: export TARGET := ios
 release-ios: export BUILD_ENV ?= prod
-release-ios: watchman-clean ##@build build release for iOS release
+release-ios: watchman-clean ##@build Build release for iOS release
 	@git clean -dxf -f target/ios && \
 	$(MAKE) jsbundle-ios && \
-	scripts/copy-translations.sh && \
 	xcodebuild -workspace ios/StatusIm.xcworkspace -scheme StatusIm -configuration Release -destination 'generic/platform=iOS' -UseModernBuildSystem=N clean archive

-release-desktop: export TARGET ?= $(HOST_OS)
-release-desktop: ##@build build release for desktop release based on TARGET
-	@$(MAKE) jsbundle-desktop && \
-	scripts/copy-translations.sh && \
-	scripts/build-desktop.sh; \
-	$(MAKE) watchman-clean
-
-release-windows-desktop: export TARGET ?= windows
-release-windows-desktop: ##@build build release for windows desktop release
-	@$(MAKE) jsbundle-desktop && \
-	scripts/copy-translations.sh && \
-	scripts/build-desktop.sh; \
-	$(MAKE) watchman-clean
-
-prod-build-android: jsbundle-android ##@legacy temporary legacy alias for jsbundle-android
-	@echo "${YELLOW}This a deprecated target name, use jsbundle-android.$(RESET)"
-
 jsbundle-android: SHELL := /bin/sh
-jsbundle-android: export TARGET ?= android
+jsbundle-android: export TARGET := android
 jsbundle-android: export BUILD_ENV ?= prod
-jsbundle-android: ##@jsbundle Compile JavaScript and Clojure into index.android.js
-	# Call nix-build to build the 'targets.mobile.android.jsbundle' attribute and copy the index.android.js file to the project root
-	@git clean -dxf ./index.$(TARGET).js
+jsbundle-android: ##@jsbundle Compile JavaScript and Clojurescript into app directory
+	# Call nix-build to build the 'targets.mobile.android.jsbundle' attribute and copy the.js files to the project root
 	nix/scripts/build.sh targets.mobile.android.jsbundle && \
-	mv result/index.$(TARGET).js ./
+	mv result/* ./

-prod-build-ios: jsbundle-ios ##@legacy temporary legacy alias for jsbundle-ios
-	@echo "${YELLOW}This a deprecated target name, use jsbundle-ios.$(RESET)"
-
-jsbundle-ios: export TARGET ?= ios
+jsbundle-ios: export TARGET := ios
 jsbundle-ios: export BUILD_ENV ?= prod
 jsbundle-ios: ##@jsbundle Compile JavaScript and Clojure into index.ios.js
-	@git clean -dxf -f ./index.$(TARGET).js && \
-	lein jsbundle-ios && \
-	node prepare-modules.js
-
-prod-build-desktop: jsbundle-desktop ##@legacy temporary legacy alias for jsbundle-desktop
-	@echo "${YELLOW}This a deprecated target name, use jsbundle-desktop.$(RESET)"
-
-jsbundle-desktop: export TARGET ?= $(HOST_OS)
-jsbundle-desktop: export BUILD_ENV ?= prod
-jsbundle-desktop: ##@jsbundle Compile JavaScript and Clojure into index.desktop.js
-	git clean -qdxf -f ./index.desktop.js desktop/ && \
-	lein jsbundle-desktop && \
-	node prepare-modules.js
+	yarn shadow-cljs release mobile

 #--------------
-# REPL
-# -------------
+# status-go lib
+#--------------

-_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-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-ios-real: export TARGET := ios
-watch-ios-real: _watch-ios-real ##@watch Start development for iOS real device
-
-watch-ios-simulator: export TARGET := ios
-watch-ios-simulator: _watch-ios-simulator ##@watch Start development for iOS simulator
-
-watch-android-real: export TARGET := android
-watch-android-real: _watch-android-real ##@watch Start development for Android real device
-
-watch-android-avd: export TARGET := android
-watch-android-avd: _watch-android-avd ##@watch Start development for Android AVD
-
-watch-android-genymotion: export TARGET ?= android
-watch-android-genymotion: _watch-android-genymotion ##@watch Start development for Android Genymotion
-
-watch-desktop: export TARGET ?= $(HOST_OS)
-watch-desktop: ##@watch Start development for Desktop
-	clj -R:dev build.clj watch --platform desktop
-
-desktop-server: export TARGET ?= $(HOST_OS)
-desktop-server:
-	node ubuntu-server.js
+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

 #--------------
-# Run
-# -------------
-_run-%:
-	$(eval SYSTEM := $(word 2, $(subst -, , $@)))
-	npx react-native run-$(SYSTEM)
+# Watch, Build & Review changes
+#--------------
+
+run-clojure: export TARGET := clojure
+run-clojure: ##@run Watch for and build Clojure changes for mobile
+	yarn shadow-cljs watch mobile
+
+run-metro: export TARGET := clojure
+run-metro: ##@run Start Metro to build React Native changes
+	@scripts/start-react-native.sh
+
+run-re-frisk: export TARGET := clojure
+run-re-frisk: ##@run Start re-frisk server
+	yarn shadow-cljs run re-frisk-remote.core/start

 # TODO: Migrate this to a Nix recipe, much the same way as nix/mobile/android/targets/release-android.nix
 run-android: export TARGET := android
-run-android: ##@run Run Android build
+run-android: ##@run Build Android APK and start it on the device
 	npx react-native run-android --appIdSuffix debug

-run-desktop: export TARGET ?= $(HOST_OS)
-run-desktop: _run-desktop ##@run Run Desktop build
-
 SIMULATOR=
 run-ios: export TARGET := ios
-run-ios: ##@run Run iOS build
+run-ios: ##@run Build iOS app and start it in a simulator/device
 ifneq ("$(SIMULATOR)", "")
 	npx react-native run-ios --simulator="$(SIMULATOR)"
 else
@@ -289,21 +276,21 @@ endif
 # Tests
 #--------------

-lint: export TARGET := lein
+lint: export TARGET := clojure
 lint: ##@test Run code style checks
-	lein cljfmt check
+	yarn clj-kondo --confg .clj-kondo/config.edn --lint src && \
+	TARGETS=$$(git diff --diff-filter=d --cached --name-only src && echo src) && \
+	clojure -Scp "$$CLASS_PATH" -m cljfmt.main check --indents indentation.edn $$TARGETS

-lint-fix: export TARGET := lein
+lint-fix: export TARGET := clojure
 lint-fix: ##@test Run code style checks and fix issues
-	lein cljfmt fix
+	clojure -Scp "$$CLASS_PATH" -m cljfmt.main fix src --indents indentation.edn

-test: export TARGET := lein
+test: export TARGET := clojure
 test: ##@test Run tests once in NodeJS
-	lein with-profile test doo node test once
-
-test-auto: export TARGET := lein
-test-auto: ##@test Run tests in interactive (auto) mode in NodeJS
-	lein with-profile test doo node test
+	yarn shadow-cljs compile mocks && \
+	yarn shadow-cljs compile test && \
+	node --require ./test-resources/override.js target/test/test.js

 coverage: ##@test Run tests once in NodeJS generating coverage
 	@scripts/run-coverage.sh
@@ -311,29 +298,16 @@ coverage: ##@test Run tests once in NodeJS generating coverage
 #--------------
 # Other
 #--------------
-react-native-desktop: export TARGET ?= $(HOST_OS)
-react-native-desktop: export _NIX_PURE ?= true
-react-native-desktop: ##@other Start react native packager
-	@scripts/start-react-native.sh
-
-react-native-android: export TARGET := android
-react-native-android: export _NIX_PURE ?= true
-react-native-android: ##@other Start react native packager for Android client
-	@scripts/start-react-native.sh
-
-react-native-ios: export TARGET := ios
-react-native-ios: export _NIX_PURE ?= true
-react-native-ios: ##@other Start react native packager for Android client
-	@scripts/start-react-native.sh

 geth-connect: export TARGET := android-env
 geth-connect: ##@other Connect to Geth on the device
 	adb forward tcp:8545 tcp:8545 && \
 	build/bin/geth attach http://localhost:8545

+android-clean: export TARGET := gradle
 android-clean: ##@prepare Clean Gradle state
-	git clean -dxf -f ./android/app/build
-	[ -d android/.gradle ] && cd android && ./gradlew clean
+	git clean -dxf -f ./android/app/build; \
+	[[ -d android/.gradle ]] && cd android && ./gradlew clean

 android-ports: export TARGET := android-env
 android-ports: ##@other Add proxies to Android Device/Simulator
@@ -352,38 +326,19 @@ android-logcat: ##@other Read status-react logs from Android phone using adb

 android-install: export TARGET := android-env
 android-install: export BUILD_TYPE ?= release
-android-install:
+android-install: ##@other Install APK on device using adb
 	adb install result/app-$(BUILD_TYPE).apk

 _list: SHELL := /bin/sh
 _list:
 	@$(MAKE) -pRrq -f $(lastword $(MAKEFILE_LIST)) : 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | sort | egrep -v -e '^[^[:alnum:]]' -e '^$@$$'

-_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
+#--------------
+# REPLs
+#--------------

-_startdev-%: SHELL := /bin/sh
-_startdev-%:
-	$(eval SYSTEM := $(word 2, $(subst -, , $@)))
-	$(eval DEVICE := $(word 3, $(subst -, , $@)))
-	@ if [ -z "$(DEVICE)" ]; then \
-		$(MAKE) watch-$(SYSTEM) || $(MAKE) _unknown-startdev-target-$@; \
-	else \
-		$(MAKE) watch-$(SYSTEM)-$(DEVICE) || $(MAKE) _unknown-startdev-target-$@; \
-	fi
+repl-clojure: export TARGET := clojure
+repl-clojure: ##@repl Start Clojure repl for mobile App
+	yarn shadow-cljs cljs-repl mobile

-startdev-android-avd: export TARGET = android
-startdev-android-avd: _startdev-android-avd
-startdev-android-genymotion: export TARGET = android
-startdev-android-genymotion: _startdev-android-genymotion
-startdev-android-real: export TARGET = android
-startdev-android-real: _startdev-android-real
-startdev-desktop: export TARGET ?= $(HOST_OS)
-startdev-desktop: _startdev-desktop
-startdev-ios-real: export TARGET = ios
-startdev-ios-real: _startdev-ios-real
-startdev-ios-simulator: export TARGET = ios
-startdev-ios-simulator: _startdev-ios-simulator
+repl-nix: nix-repl ##@repl Start an interactive Nix REPL
@@ -1,6 +1,9 @@
-
 # 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/)
+[<img src="doc/github_badge.png" alt="Get it on Github" height="80"/>](https://github.com/status-im/status-react/releases)
+
 Join us in creating a browser, messenger, and gateway to a decentralized world. Status is a free (libre) open source mobile client targeting Android & iOS built entirely on [Ethereum](https://ethereum.org/) technologies. That's right, no middle men and `go-ethereum` running directly on your device.

 [![Getting started with Status](https://i.imgur.com/C0aZZEL.jpg)](https://www.youtube.com/watch?v=oDCSEmS9c3o "Getting started with Status")
@@ -21,10 +24,10 @@ Go straight to the [docs](https://status.im/docs) or [join our chat](https://joi

 - **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.
+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/technical/build_status/), which talks about managing project dependencies, coding guidelines and testing procedures.

 - **Community Management**  
-Metcalfe's law states that the value of a network is proportional to the square of the number of connected users of the system - without community Status is meaningless. We're looking to create a positive, fun environment to explore new ideas, experiment and grow the Status community. Building a community takes a lot of work but the people you'll meet and long lasting relationships you form will be well worth it, check out our [Community Principles](https://status.im/contribute/our_principles.html)
+Metcalfe's law states that the value of a network is proportional to the square of the number of connected users of the system - without community Status is meaningless. We're looking to create a positive, fun environment to explore new ideas, experiment and grow the Status community. Building a community takes a lot of work but the people you'll meet and long lasting relationships you form will be well worth it, check out our [Mission and Community Principles](https://status.im/about)

 - **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.
@@ -33,7 +36,7 @@ John Dewey once said "Education is not preparation for life; education is life *
 Content is King, keeping our blog up to date and informing the community of news helps keep everyone on the same page. [Jump into our chat](https://join.status.im/chat/public/status) and discuss with the team how you can contribute!

 - **Testers**  
-It's bug hunting season! Status is currently in Alpha and there is sure to be a bunch of learning, [build status from scratch](https://status.im/build_status/) or if an android user check out our [nightly builds](https://status.im/nightly). You can shake your phone to submit bug reports, or start browsing our [Github Issues](https://github.com/status-im/status-react/issues). Every bug you find brings Status closer to stable, usable software for everyone to enjoy!
+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](https://status.im/technical/build_status/) or if an android user check out our [nightly builds](https://status.im/nightly). You can shake your phone to submit bug reports, or start browsing our [Github Issues](https://github.com/status-im/status-react/issues). Every bug you find brings Status closer to stable, usable software for everyone to enjoy!

 - **Security**  
 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!
@@ -46,7 +49,7 @@ View our [API Docs](https://status.im/developer_tools/status_web_api.html) and l

 ## 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/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/technical/build_status/).

 ## Core Contributors

@@ -1,50 +0,0 @@
-# Description
-
-This document provides information on how to start developing Status App.
-
-# Getting Started
-
-To start developing start a shell for platform you are interested in.
-```
-make shell TARGET=android
-```
-This step will take a while the first time as it will download all dependencies.
-
-To build the app, your can simply run on of the following:
-```
-make release-android
-make release-ios
-```
-For more `make` targets run `make help`.
-
-# Manual Steps
-
-There are a few manual steps you might want to do in order to start contributing.
-
-## Genymotion Virtualization
-
-Optionally set up Genymotion if you don't want to use Android Virtual Device:
-
-https://www.genymotion.com
-
-## Android Development Environment
-
-You can also setup Android Development Environment + Simulator:
-
-https://facebook.github.io/react-native/docs/getting-started.html
-
-## Configure GitHub Account
-
-The optimal way of pushing to GitHubis using SSH instead of user/pass auth.
-
-It's recommented that you [add your public SSH key to your GitHub account](https://help.github.com/en/github/authenticating-to-github/adding-a-new-ssh-key-to-your-github-account).
-
-## Configure GPG Keys for signing commits
-
-In order to increase security we require all commits in `status-react` repo to be signed with a GPG key.
-
-Steps:
-1. [Generate a new GPG key](https://help.github.com/en/github/authenticating-to-github/generating-a-new-gpg-key)
-2. [Setup Git to use your GPG key](https://help.github.com/en/github/authenticating-to-github/telling-git-about-your-signing-key)
-3. [Setup Git to sign commits](https://help.github.com/en/github/authenticating-to-github/signing-commits)
-4. [Setup GitHub to validate commits](https://help.github.com/en/github/authenticating-to-github/adding-a-new-gpg-key-to-your-github-account)
@@ -1 +1 @@
-1.2.1
+1.19.0
@@ -1,53 +0,0 @@
-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',
-  ],
-)
@@ -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.android.js",
+ *   entryFile: "index.js",
 *
 *   // whether to bundle JS and assets in debug mode
 *   bundleInDebug: false,
@@ -70,7 +70,7 @@ 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"],
+ *   nodeExecutableAndArgs: ["node", "--max-old-space-size=8192"],
 *
 *   // supply additional arguments to the packager
 *   extraPackagerArgs: []
@@ -78,8 +78,13 @@ import com.sun.org.apache.xalan.internal.xsltc.compiler.Copy
 */
 project.ext.react = [
    nodeExecutableAndArgs: ["node", "--max-old-space-size=16384"],
-    entryFile: "index.android.js",
-    enableHermes: true,     // clean and rebuild if changing. NOTE: Hermes engine is required for Android 64-bit builds running on 64 devices, to guard against a hang in the UI thread after invoking status-go
+    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: true,
+    /* Disable 'The first definition was here.' warnings */
+    hermesFlagsRelease: ["-w"],
    bundleInPr: true,
    inputExcludes: ["android/**", "ios/**", "react-native/**", "src/**", "test/**"]
 ]
@@ -118,6 +123,18 @@ def jscFlavor = 'org.webkit:android-jsc:+'
 */
 def enableHermes = project.ext.react.get("enableHermes", false);

+/**
+ * Exclude google library so we can publish to external android stores
+ */
+def googleFree = project.env.get("GOOGLE_FREE", 0) == '1'
+
+def getCommitHash = { ->
+    if (project.hasProperty("commitHash")) {
+        return project.commitHash
+    }
+    return "unknown"
+}
+
 def getVersionCode = { ->
    new ByteArrayOutputStream().withStream { stdOut ->
        if (project.hasProperty("versionCode")) {
@@ -174,6 +191,7 @@ android {
        versionCode getVersionCode()
        versionName getVersionName()
        missingDimensionStrategy 'react-native-camera', 'general'
+        manifestPlaceholders = [commitHash: getCommitHash()]
        /* this needs to be empty if we want APKs split by ABIs */
        if (!getEnvOrConfig('ANDROID_ABI_SPLIT').toBoolean()) {
            ndk {
@@ -199,6 +217,12 @@ android {
        exclude '/lib/mips64/**'
        exclude '/lib/armeabi/**'

+        pickFirst '**/armeabi-v7a/libc++_shared.so'
+        pickFirst '**/x86/libc++_shared.so'
+        pickFirst '**/arm64-v8a/libc++_shared.so'
+        pickFirst '**/x86_64/libc++_shared.so'
+        pickFirst '**/x86/libjsc.so'
+        pickFirst '**/armeabi-v7a/libjsc.so'

        /** Fix for: Execution failed for task ':app:transformNativeLibsWithStripDebugSymbolForDebug'.
        *   with recent version of ndk (17.0.4754217)
@@ -217,6 +241,8 @@ android {
            keyAlias 'androiddebugkey'
            keyPassword 'android'
        }
+        /* Caution! In production, you need to generate your own keystore file.
+         * See: https://facebook.github.io/react-native/docs/signed-apk-android */
        release {
            /* environment variables take precedence over gradle.properties file */
            storeFile     file(getEnvOrConfig('KEYSTORE_PATH').replaceAll("~", System.properties['user.home']))
@@ -242,11 +268,11 @@ android {
            resValue "string", "build_config_package", "im.status.ethereum"
        }
        release {
-            // Caution! In production, you need to generate your own keystore file.
-            // see https://facebook.github.io/react-native/docs/signed-apk-android.
            minifyEnabled enableProguardInReleaseBuilds
            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
-            signingConfig signingConfigs.release
+            if (getEnvOrConfig('ANDROID_APK_SIGNED').toBoolean()) {
+                signingConfig signingConfigs.release
+            }
        }
        pr {
            initWith release
@@ -287,6 +313,19 @@ dependencies {
    implementation fileTree(dir: "libs", include: ["*.jar"])
    implementation "com.facebook.react:react-native:+"  // From node_modules

+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+
+    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
+        exclude group:'com.facebook.fbjni'
+    }
+    // TODO Uncomment once Flipper does not cause webview crashes in Debug mode
+    // debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
+    //      exclude group:'com.facebook.flipper'
+    // }
+    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
+        exclude group:'com.facebook.flipper'
+    }
+
    if (enableHermes) {
      def hermesPath = "../../node_modules/hermes-engine/android/";
      debugImplementation files(hermesPath + "hermes-debug.aar")
@@ -296,6 +335,16 @@ dependencies {
      implementation jscFlavor
    }

+    if (googleFree) {
+        implementation(project(':react-native-device-info')) {
+            exclude group: 'com.google.firebase'
+            exclude group: 'com.google.android.gms'
+            exclude group: 'com.android.installreferrer'
+        }
+    } else {
+	implementation 'com.google.firebase:firebase-messaging:23.0.0'
+    }
+
    // react-native-screens
    implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0-alpha02'
@@ -307,31 +356,47 @@ dependencies {
    // 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-status')
-    implementation project(':react-native-webview-bridge')
    implementation project(':react-native-status-keycard')
    implementation 'com.github.status-im:function:0.0.1'
-    implementation 'com.facebook.fresco:fresco:2.0.0'
-    implementation 'com.facebook.fresco:animated-gif:2.0.0'
+    implementation 'com.facebook.fresco:fresco:2.2.0'
+    implementation 'com.facebook.fresco:animated-gif:2.2.0'
+    implementation "com.squareup.okhttp3:okhttp-tls:3.12.12"
+}
+
+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')
 }

 // 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 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')
+    def localNdkDir = getLocalNDKDir()
+    def ndkDir = System.env.ANDROID_NDK_ROOT
+    if (localNdkDir != null) {
+        ndkDir = localNdkDir
    }
-    executable "$ndkDir/ndk-build"
+
+    def execPath = "$ndkDir/ndk-build"
+    def exec = new File(execPath)
+    if (!exec.exists()) {
+        throw new GradleException("No ndk-build binary found!")
+    }
+    executable execPath
 }

 preBuild.dependsOn hemroidBuild

 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+
+if (!googleFree) {
+	apply plugin: "com.google.gms.google-services"
+}
@@ -0,0 +1,119 @@
+{
+  "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": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "854811651919-gua52csicclb5p9gr4eeu33ukk0aaphj.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "854811651919-30s20e3l0me0ins0vc4185jbnj7ja49o.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "im.status.ethereum"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:854811651919:android:15dbe4af1e06ca3e005f3a",
+        "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": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "854811651919-gua52csicclb5p9gr4eeu33ukk0aaphj.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "854811651919-30s20e3l0me0ins0vc4185jbnj7ja49o.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "im.status.ethereum"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:854811651919:android:1d0d69fe8c1bb89b005f3a",
+        "android_client_info": {
+          "package_name": "im.status.ethereum.pr"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "854811651919-gua52csicclb5p9gr4eeu33ukk0aaphj.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAOF4W1j8GYeXzzVKRfNKlXywD6bx0rJtQ"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "854811651919-gua52csicclb5p9gr4eeu33ukk0aaphj.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "854811651919-30s20e3l0me0ins0vc4185jbnj7ja49o.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "im.status.ethereum"
+              }
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
@@ -15,6 +15,9 @@

 # 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
@@ -61,3 +64,15 @@
 -dontwarn java.nio.file.*
 -dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
 -dontwarn okio.**
+
+# fast-image
+
+-keep public class com.dylanvann.fastimage.* {*;}
+-keep public class com.dylanvann.fastimage.** {*;}
+-keep public class * implements com.bumptech.glide.module.GlideModule
+-keep public class com.bumptech.glide.annotation.GlideModule
+-keep public class * extends com.bumptech.glide.module.AppGlideModule
+-keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
+  **[] $VALUES;
+  public *;
+}
@@ -2,7 +2,10 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
          xmlns:tools="http://schemas.android.com/tools">

-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <!-- 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"/>

    <application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning" android:usesCleartextTraffic="true" />
 </manifest>
@@ -0,0 +1,73 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
+ * directory of this source tree.
+ */
+package im.status.ethereum;
+
+import android.content.Context;
+import com.facebook.flipper.android.AndroidFlipperClient;
+import com.facebook.flipper.android.utils.FlipperUtils;
+import com.facebook.flipper.core.FlipperClient;
+import com.facebook.flipper.plugins.crashreporter.CrashReporterPlugin;
+import com.facebook.flipper.plugins.databases.DatabasesFlipperPlugin;
+import com.facebook.flipper.plugins.fresco.FrescoFlipperPlugin;
+import com.facebook.flipper.plugins.inspector.DescriptorMapping;
+import com.facebook.flipper.plugins.inspector.InspectorFlipperPlugin;
+// import com.facebook.flipper.plugins.network.FlipperOkhttpInterceptor;
+// import com.facebook.flipper.plugins.network.NetworkFlipperPlugin;
+import com.facebook.flipper.plugins.react.ReactFlipperPlugin;
+import com.facebook.flipper.plugins.sharedpreferences.SharedPreferencesFlipperPlugin;
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.modules.network.NetworkingModule;
+import okhttp3.OkHttpClient;
+
+public class ReactNativeFlipper {
+  public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
+    if (FlipperUtils.shouldEnableFlipper(context)) {
+      final FlipperClient client = AndroidFlipperClient.getInstance(context);
+
+      client.addPlugin(new InspectorFlipperPlugin(context, DescriptorMapping.withDefaults()));
+      client.addPlugin(new ReactFlipperPlugin());
+      client.addPlugin(new DatabasesFlipperPlugin(context));
+      client.addPlugin(new SharedPreferencesFlipperPlugin(context));
+      client.addPlugin(CrashReporterPlugin.getInstance());
+
+      // TODO Uncomment once Flipper does not cause webview crashes in Debug mode
+      // NetworkFlipperPlugin networkFlipperPlugin = new NetworkFlipperPlugin();
+      // NetworkingModule.setCustomClientBuilder(
+      //     new NetworkingModule.CustomClientBuilder() {
+      //       @Override
+      //       public void apply(OkHttpClient.Builder builder) {
+      //         builder.addNetworkInterceptor(new FlipperOkhttpInterceptor(networkFlipperPlugin));
+      //       }
+      //     });
+      // client.addPlugin(networkFlipperPlugin);
+      client.start();
+
+      // Fresco Plugin needs to ensure that ImagePipelineFactory is initialized
+      // Hence we run if after all native modules have been initialized
+      ReactContext reactContext = reactInstanceManager.getCurrentReactContext();
+      if (reactContext == null) {
+        reactInstanceManager.addReactInstanceEventListener(
+            new ReactInstanceManager.ReactInstanceEventListener() {
+              @Override
+              public void onReactContextInitialized(ReactContext reactContext) {
+                reactInstanceManager.removeReactInstanceEventListener(this);
+                reactContext.runOnNativeModulesQueueThread(
+                    new Runnable() {
+                      @Override
+                      public void run() {
+                        client.addPlugin(new FrescoFlipperPlugin());
+                      }
+                    });
+              }
+            });
+      } else {
+        client.addPlugin(new FrescoFlipperPlugin());
+      }
+    }
+  }
+}
@@ -17,15 +17,12 @@
    <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"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+                     android:maxSdkVersion="28" />
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
    <uses-permission android:name="android.permission.USE_FINGERPRINT" />

-    <uses-permission android:name="com.android.vending.BILLING" />
-
-    <!-- these permissions should be removed -->
-    <!-- React Native unnecessary permissions (https://github.com/facebook/react-native/issues/5886) -->
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" tools:node="remove"/>
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />

    <application
            tools:replace="android:allowBackup"
@@ -36,12 +33,13 @@
            android:name=".MainApplication"
            android:largeHeap="true"
            android:usesCleartextTraffic="true">
+        <meta-data android:name="commitHash" android:value="${commitHash}"/>
        <activity
                android:name=".MainActivity"
                android:label="@string/app_name"
                android:screenOrientation="portrait"
                android:windowSoftInputMode="adjustResize"
-                android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+                android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
                android:resizeableActivity="false"
                android:launchMode="singleTask">
            <intent-filter>
@@ -71,7 +69,7 @@
            </intent-filter>
        </activity>
        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity"/>
-        <service android:name="im.status.ethereum.module.ForegroundService"></service>
+        <service android:name="im.status.ethereum.pushnotifications.ForegroundService"></service>
        <provider
            android:name="androidx.core.content.FileProvider"
            android:authorities="${applicationId}.provider"
@@ -83,6 +81,12 @@
                android:name="android.support.FILE_PROVIDER_PATHS"
                android:resource="@xml/file_provider_paths" />
        </provider>
+	<meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/notification_icon" />
+	<meta-data
+            android:name="com.google.firebase.messaging.default_notification_color"
+            android:resource="@color/notification_icon_color" />
    </application>

 </manifest>
@@ -23,17 +23,21 @@ import android.provider.Settings;
 import android.os.Bundle;
 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.facebook.react.ReactFragmentActivity;
-import com.facebook.react.ReactActivity;
+import com.reactnativenavigation.NavigationActivity;
 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 ReactFragmentActivity
+public class MainActivity extends NavigationActivity
        implements ActivityCompat.OnRequestPermissionsResultCallback{


@@ -97,6 +101,16 @@ public class MainActivity extends ReactFragmentActivity
        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);
@@ -108,6 +122,17 @@ public class MainActivity extends ReactFragmentActivity
    @Override
    protected void onCreate(Bundle savedInstanceState) {

+        switch (getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) {
+            case Configuration.UI_MODE_NIGHT_YES:
+                setTheme(R.style.DarkTheme);
+
+                break;
+            case Configuration.UI_MODE_NIGHT_NO:
+                setTheme(R.style.LightTheme);
+                break;
+            default:
+                setTheme(R.style.LightTheme);
+        }
        // Make sure we get an Alert for every uncaught exceptions
        registerUncaughtExceptionHandler(MainActivity.this);

@@ -156,6 +181,16 @@ public class MainActivity extends ReactFragmentActivity
            @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);
+                }
            }
        };

@@ -167,14 +202,7 @@ public class MainActivity extends ReactFragmentActivity
        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) {
@@ -188,7 +216,7 @@ public class MainActivity extends ReactFragmentActivity
    private static final Integer FREQUENCY_OF_REMINDER_IN_PERCENT = 5;

    private boolean shouldShowRootedNotification() {
-        if (RootUtil.isDeviceRooted()) {
+        if (RootUtil.isDeviceRooted() && BuildConfig.ENABLE_ROOT_ALERT == "1") {
            if (userRejectedRootedNotification()) {
                return ((Math.random() * 100) < FREQUENCY_OF_REMINDER_IN_PERCENT);
            } else return true;
@@ -230,19 +258,5 @@ public class MainActivity extends ReactFragmentActivity
        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);
-        }
-    }
-
-    @Override
-    protected ReactActivityDelegate createReactActivityDelegate() {
-        return new ReactActivityDelegate(this, getMainComponentName()) {
-            @Override
-            protected ReactRootView createRootView() {
-                return new RNGestureHandlerEnabledRootView(MainActivity.this);
-            }
-        };
    }
 }
@@ -2,25 +2,31 @@ package im.status.ethereum;

 import androidx.multidex.MultiDexApplication;
 import android.util.Log;
+import android.content.Context;
+import android.webkit.WebView;
+import java.lang.reflect.InvocationTargetException;
 import com.facebook.react.PackageList;
-import com.facebook.hermes.reactexecutor.HermesExecutorFactory;
-import com.facebook.react.bridge.JavaScriptExecutorFactory;

 import com.aakashns.reactnativedialogs.ReactNativeDialogsPackage;
 import com.facebook.react.ReactApplication;
+import cl.json.RNSharePackage;
 import com.facebook.react.ReactNativeHost;
+import com.reactnativenavigation.NavigationApplication;
+import com.reactnativenavigation.react.NavigationReactNativeHost;
 import com.facebook.react.ReactPackage;
-import com.facebook.soloader.SoLoader;
-import com.github.alinz.reactnativewebviewbridge.WebViewBridgePackage;
+import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.modules.network.OkHttpClientProvider;

 import java.util.List;

 import im.status.ethereum.keycard.RNStatusKeycardPackage;
 import im.status.ethereum.module.StatusPackage;
+import im.status.ethereum.pushnotifications.PushNotificationPackage;
+import im.status.ethereum.StatusOkHttpClientFactory;

-public class MainApplication extends MultiDexApplication implements ReactApplication {
+public class MainApplication extends NavigationApplication {

-    private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
+    private final ReactNativeHost mReactNativeHost = new NavigationReactNativeHost(this) {
        @Override
        public boolean getUseDeveloperSupport() {
            return BuildConfig.DEBUG;
@@ -29,17 +35,18 @@ public class MainApplication extends MultiDexApplication implements ReactApplica
        @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 WebViewBridgePackage(BuildConfig.DEBUG_WEBVIEW == "1"));
+            packages.add(new PushNotificationPackage());
            return packages;
        }

        @Override
        protected String getJSMainModuleName() {
-            return "index.android";
+            return "index";
        }
    };

@@ -51,6 +58,40 @@ public class MainApplication extends MultiDexApplication implements ReactApplica
    @Override
    public void onCreate() {
        super.onCreate();
-        SoLoader.init(this, /* native exopackage */ false);
+
+        OkHttpClientProvider.setOkHttpClientFactory(new StatusOkHttpClientFactory());
+
+        WebView.setWebContentsDebuggingEnabled(BuildConfig.DEBUG_WEBVIEW == "1");
+        initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+    }
+    /**
+     * Loads Flipper in React Native templates. Call this in the onCreate method with something like
+     * initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
+     *
+     * @param context
+     * @param reactInstanceManager
+     */
+    private static void initializeFlipper(
+          Context context, ReactInstanceManager reactInstanceManager) {
+        if (BuildConfig.DEBUG) {
+            try {
+                /*
+                  We use reflection here to pick up the class that initializes Flipper,
+                  since Flipper library is not available in release mode
+                */
+                Class<?> aClass = Class.forName("im.status.ethereum.ReactNativeFlipper");
+                aClass
+                    .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
+                    .invoke(null, context, reactInstanceManager);
+            } catch (ClassNotFoundException e) {
+                e.printStackTrace();
+            } catch (NoSuchMethodException e) {
+                e.printStackTrace();
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            } catch (InvocationTargetException e) {
+                e.printStackTrace();
+            }
+        }
    }
 }
@@ -0,0 +1,44 @@
+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 {
+  public OkHttpClient createNewNetworkModuleClient() {
+    String certPem = StatusPackage.getImageTLSCert();
+    X509Certificate cert;
+
+    try {
+      CertificateFactory cf = CertificateFactory.getInstance("X.509");
+      cert = (X509Certificate) cf.generateCertificate(new ByteArrayInputStream(certPem.getBytes()));
+    } catch(Exception e) {
+      Log.e("StatusOkHttpClientFactory", "Could not parse certificate");
+      cert = null;
+    }
+
+    HandshakeCertificates clientCertificates = new HandshakeCertificates.Builder()
+      .addPlatformTrustedCertificates()
+      .addTrustedCertificate(cert)
+      .build();
+
+    return OkHttpClientProvider.createClientBuilder()
+      .sslSocketFactory(clientCertificates.sslSocketFactory(), clientCertificates.trustManager())
+      .build();
+  }
+}
--- a/Show More
+++ b/Show More
@@ -1 +1 @@
 .2.1
 .19.0