draft

* Long quoted message in the reply box is not cut, goes beyond reply box and overlapped by cancel button

* Lint fix

.babelrc

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

.carve_ignore

@@ -1,8 +1,7 @@
 status-im.utils.build/warning-handler
 status-im.utils.build/get-current-sha
-status-im.ethereum.resolver/name
-status-im.chat.constants/spacing-char
-status-im.chat.constants/arg-wrapping-char
+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
@@ -31,7 +30,7 @@ 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.network.ui.views/mainnet?
+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
@@ -47,8 +46,8 @@ 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-im2.config/rpc-networks-only?
+status-im2.config/waku-enabled?
 status-im.utils.pairing/has-paired-installations?
 status-im.tribute-to-talk.core-test/user-cofx
 quo.gesture-handler/tap-gesture-handler
@@ -65,7 +64,7 @@ mocks.js-dependencies/emoji-picker
 mocks.js-dependencies/i18n
 mocks.js-dependencies/qr-code
 mocks.js-dependencies/svg
-mocks.js-dependencies/vector-icons
+mocks.js-dependencies/icons
 mocks.js-dependencies/webview
 mocks.js-dependencies/desktop-linking
 mocks.js-dependencies/desktop-shortcuts
@@ -155,40 +154,40 @@ 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-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!
@@ -201,7 +200,7 @@ 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
+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

.clj-kondo/config.edn

@@ -1,12 +1,23 @@
-{:lint-as {status-im.utils.views/defview  clojure.core/defn
-           status-im.utils.views/letsubs  clojure.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]}}}
+{:lint-as      {status-im.utils.views/defview  clojure.core/defn
+                status-im.utils.views/letsubs  clojure.core/let
+                reagent.core/with-let          clojure.core/let
+                status-im.utils.fx/defn        clj-kondo.lint-as/def-catch-all
+                utils.re-frame/defn            clj-kondo.lint-as/def-catch-all
+                quo.react/with-deps-check      clojure.core/fn
+                quo.previews.preview/list-comp clojure.core/for
+                status-im.utils.styles/def     clojure.core/def
+                status-im.utils.styles/defn    clojure.core/defn
+                test-helpers.unit/deftest-sub  clojure.core/defn
+                taoensso.tufte/defnp           clojure.core/defn}
+ :linters      {:consistent-alias  {:level   :error
+                                    :aliases {clojure.string  string
+                                              clojure.set     set
+                                              clojure.walk    walk
+                                              taoensso.timbre log}}
+                :invalid-arity     {:skip-args [status-im.utils.fx/defn utils.re-frame/defn]}
+                ;; TODO remove number when this is fixed
+                ;; https://github.com/borkdude/clj-kondo/issues/867
+                :unresolved-symbol {:exclude [PersistentPriorityMap.EMPTY
+                                              number
+                                              status-im.test-helpers/restore-app-db]}}
+ :config-in-ns {mocks.js-dependencies {:linters {:clojure-lsp/unused-public-var {:level :off}}}}}

.dependabot/config.yml

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

.detoxrc.js

@@ -0,0 +1,37 @@
+module.exports = {
+  "testRunner": "jest",
+  "testRegex": "\\.visual\\.js$",
+  "runner-config": "visual-test/config.json",
+  "devices": {
+    "simulator": {
+      "type": "ios.simulator",
+      "device": {
+        "type": "iPhone 11 Pro"
+      }
+    }
+  },
+  "apps": {
+    "ios.release": {
+      "name": "StatusIm",
+      "type": "ios.app",
+      "binaryPath": "ios/build/Build/Products/Release-iphonesimulator/StatusIm.app",
+      "build": "make release-ios"
+    },
+    "ios.debug": {
+      "name": "StatusIm",
+      "type": "ios.app",
+      "binaryPath": process.env.TEST_BINARY_PATH,
+      "build": "make run-ios SIMULATOR='iPhone 11 Pro'"
+    }
+  },
+  "configurations": {
+    "ios.sim.release": {
+      "device": "simulator",
+      "app": "ios.release"
+    },
+    "ios.sim.debug": {
+      "device": "simulator",
+      "app": "ios.debug"
+    }
+  }
+}

.env

@@ -2,12 +2,10 @@ CACHED_WEBVIEWS_ENABLED=1
 DEBUG_WEBVIEW=1
 DEFAULT_NETWORK=mainnet_rpc
 DEV_BUILD=1
-ERC20_CONTRACT_WARNINGS=0
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=eth.prod
+FLEET=status.prod
 GROUP_CHATS_ENABLED=1
-HARDWALLET_ENABLED=1
 LOG_LEVEL=info
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
@@ -18,8 +16,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_QUO_PREVIEW=1
+MAX_IMAGES_BATCH=5
+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

.env.e2e

@@ -1,12 +1,10 @@
 DEBUG_WEBVIEW=1
-DEFAULT_NETWORK=testnet_rpc
-ERC20_CONTRACT_WARNINGS=1
+DEFAULT_NETWORK=goerli_rpc
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=eth.prod
+FLEET=status.prod
 GROUP_CHATS_ENABLED=1
-HARDWALLET_ENABLED=1
-LOG_LEVEL=info
+LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=0
 PAIRING_POPUP_DISABLED=1
 PFS_ENCRYPTION_ENABLED=1
@@ -17,9 +15,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
+QR_READ_TEST_MENU=1
+ENABLE_ROOT_ALERT=0
+MAX_IMAGES_BATCH=5
+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

.env.jenkins

@@ -1,13 +1,11 @@
 CACHED_WEBVIEWS_ENABLED=1
 DEBUG_WEBVIEW=1
-DEFAULT_NETWORK=mainnet_rpc
-ERC20_CONTRACT_WARNINGS=0
+DEFAULT_NETWORK=goerli_rpc
 ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
-FLEET=eth.prod
+FLEET=status.prod
 GROUP_CHATS_ENABLED=1
-HARDWALLET_ENABLED=1
-LOG_LEVEL=info
+LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=1
 MAINNET_WARNING_ENABLED=1
 PFS_ENCRYPTION_ENABLED=1
@@ -18,6 +16,22 @@ SNOOPY=0
 RPC_NETWORKS_ONLY=0
 PARTITIONED_TOPIC=0
 CONTRACT_NODES=1
-MOBILE_UI_FOR_DESKTOP=1
 STATUS_GO_ENABLE_NIMBUS=0
+COMMANDS_ENABLED=1
 KEYCARD_TEST_MENU=0
+ENABLE_ROOT_ALERT=1
+DISABLE_WALLET_ON_MOBILE_NETWORK=1
+APN_TOPIC=im.status.ethereum.pr
+VERIFY_TRANSACTION_CHAIN_ID=5
+VERIFY_ENS_CHAIN_ID=5
+TEST_STATEOFUS=1
+BLANK_PREVIEW=0
+MAX_IMAGES_BATCH=5
+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

.env.nightly

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

.env.release

@@ -1,9 +1,8 @@
 DEBUG_WEBVIEW=0
 DEFAULT_NETWORK=mainnet_rpc
-ERC20_CONTRACT_WARNINGS=0
 ETHEREUM_DEV_CLUSTER=0
 EXTENSIONS=0
-FLEET=eth.prod
+FLEET=status.prod
 GROUP_CHATS_ENABLED=1
 LOG_LEVEL=
 MAILSERVER_CONFIRMATIONS_ENABLED=1
@@ -13,7 +12,10 @@ PFS_TOGGLE_VISIBLE=0
 POW_TARGET=0.002
 POW_TIME=1
 SNOOPY=0
+KEYCARD_TEST_MENU=0
 RPC_NETWORKS_ONLY=1
 PARTITIONED_TOPIC=0
-MOBILE_UI_FOR_DESKTOP=1
-HARDWALLET_ENABLED=1
+ENABLE_ROOT_ALERT=1
+MAX_IMAGES_BATCH=1
+DELETE_MESSAGE_ENABLED=1
+COLLECTIBLES_ENABLED=1

.envrc

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

.flowconfig

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

.github/CODEOWNERS

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

.github/CONTRIBUTING.md

@@ -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/)

.github/ISSUE_TEMPLATE/bug-report.md

@@ -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)
 
-```
-...
-```

.github/ISSUE_TEMPLATE/release-issue.md

@@ -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-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/github-bot.yml

@@ -5,12 +5,13 @@ project-board:
   min-reviewers: 1
   tested-pr-label-name: 'Tested - Issues'
   contributor-column-name: 'CONTRIBUTOR'
+  to-rebase-column-name: 'TO REBASE'
   review-column-name: 'REVIEW'
   test-column-name: 'E2E Tests'
 
 automated-tests:
-  repo-full-name: 'status-im/status-react'
-  job-full-name: 'end-to-end-tests/status-app-prs'
+  repo-full-name: 'status-im/status-mobile'
+  job-full-name: 'status-mobile/e2e/status-app-prs'
   kickoff-column-name: 'E2E Tests'
 
 github-team:

.gitignore

@@ -7,6 +7,7 @@
 
 # Xcode
 #
+/component-spec
 result/
 build/
 *.pbxuser
@@ -25,7 +26,6 @@ DerivedData
 *.ipa
 *.xcuserstate
 project.xcworkspace
-xcshareddata
 
 # Android/IJ
 #
@@ -40,8 +40,8 @@ local.properties
 .tags*
 
 # VS Code
-.vscode/ipch/
-.vscode/settings.json
+.vscode/
+workspace.code-workspace
 
 # node.js
 #
@@ -68,9 +68,6 @@ env/dev/env/config.cljs
 externs/
 shim.js
 
-# Desktop build
-index.desktop.js
-
 # Generated by lein voom
 #
 /pom.xml
@@ -99,11 +96,12 @@ doo-index.html
 
 # Status
 Statusgo.framework
+Statusgo.xcframework
 
 #ios
 /ios/Pods/
+/ios/logs/
 /ios/StatusIm.xcworkspace
-/ios/react-native-xcode.log
 .ruby-version
 status-e2e/
 
@@ -128,12 +126,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'
-/DEPENDENCIES.md
+# We don't use NPM
 /package-lock.json
-/package.json
-/metro.config.js
-/yarn.lock
 /.re-natal
 /re-natal
 
@@ -141,27 +135,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.*
@@ -193,3 +166,20 @@ 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

.prettierrc.js

@@ -1,6 +1,7 @@
 module.exports = {
     bracketSpacing: false,
-    jsxBracketSameLine: true,
+    bracketSameLine: true,
     singleQuote: true,
     trailingComma: 'all',
-  };
+    tabWidth: 4,
+};

.vscode/settings.json

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

.zprintrc

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

Makefile

@@ -1,4 +1,4 @@
-.PHONY: nix-add-gcroots clean nix-clean run-metro 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-rm
 
 help: SHELL := /bin/sh
 help: ##@other Show this help
@@ -32,19 +32,23 @@ ifndef BUILD_TAG
 export BUILD_TAG := $(shell git rev-parse --short HEAD)
 endif
 
-# We don't want to use /run/user/$UID because it runs out of space too easilly
-export TMPDIR = /tmp/tmp-status-react-$(BUILD_TAG)
-# this has to be specified for both the Node.JS server process and the Qt process
+# We don't want to use /run/user/$UID because it runs out of space too easilly.
+export TMPDIR = /tmp/tmp-status-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
 
 # 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
+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,STATUS_GO_SRC_OVERRIDE,NIMBUS_SRC_OVERRIDE
+export _NIX_KEEP ?= TMPDIR,BUILD_ENV,STATUS_GO_SRC_OVERRIDE
 
-# Useful for Andoird release builds
+# Useful for Android release builds
 TMP_BUILD_NUMBER := $(shell ./scripts/version/gen_build_no.sh | cut -c1-10)
 
 # MacOS root is read-only, read nix/README.md for details
@@ -57,13 +61,10 @@ 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
@@ -85,7 +86,7 @@ nix-gc: nix-gc-protected ##@nix Garbage collect all packages older than 20 days
 	nix-store --gc
 
 nix-clean: export TARGET := default
-nix-clean: ##@nix Remove all status-react build artifacts from /nix/store
+nix-clean: ##@nix Remove all status-mobile build artifacts from /nix/store
 	nix/scripts/clean.sh
 
 nix-purge: SHELL := /bin/sh
@@ -117,23 +118,36 @@ _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-mk: SHELL := /bin/sh
-_tmpdir-mk: ##@prepare Create a TMPDIR for temporary files
+$(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_REACT_HOME}
+	watchman watch-del $${STATUS_MOBILE_HOME}
 
 pod-install: export TARGET := ios
 pod-install: ##@prepare Run 'pod install' to install podfiles and update Podfile.lock
@@ -141,55 +155,81 @@ pod-install: ##@prepare Run 'pod install' to install podfiles and update Podfile
 
 update-fleets: ##@prepare Download up-to-date JSON file with current fleets state
 	curl -s https://fleets.status.im/ \
-		| jq --indent 4 --sort-keys . \
+		| sed 's/"warning": "/"warning": "DO NOT EDIT! /' \
 		> resources/config/fleets.json
 
-keystore: export TARGET := keytool
-keystore: export KEYSTORE_PATH ?= $(HOME)/.gradle/status-im.keystore
-keystore: ##@prepare Generate a Keystore for signing Android APKs
+$(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
 
-release-android: export TARGET := default
-release-android: export BUILD_ENV ?= prod
-release-android: export BUILD_TYPE ?= nightly
-release-android: export BUILD_NUMBER ?= $(TMP_BUILD_NUMBER)
+build-fdroid: export BUILD_ENV = prod
+build-fdroid: export BUILD_TYPE = release
+build-fdroid: export ANDROID_ABI_SPLIT = false
+build-fdroid: export ANDROID_ABI_INCLUDE = armeabi-v7a;arm64-v8a;x86;x86_64
+build-fdroid: ##@build Build release for F-Droid
+	@scripts/build-android.sh
+
+build-android: export BUILD_ENV ?= prod
+build-android: export BUILD_TYPE ?= nightly
+build-android: export BUILD_NUMBER ?= $(TMP_BUILD_NUMBER)
+build-android: export ANDROID_ABI_SPLIT ?= false
+build-android: export ANDROID_ABI_INCLUDE ?= armeabi-v7a;arm64-v8a;x86
+build-android: ##@build Build unsigned Android APK
+	@scripts/build-android.sh
+
+release-android: export TARGET := keytool
 release-android: export KEYSTORE_PATH ?= $(HOME)/.gradle/status-im.keystore
-release-android: export ANDROID_ABI_SPLIT ?= false
-release-android: export ANDROID_ABI_INCLUDE ?= armeabi-v7a;arm64-v8a;x86
-release-android: keystore ##@build build release for Android
-	scripts/release-android.sh
+release-android: keystore build-android ##@build Build signed Android APK
+	@scripts/sign-android.sh result/app-release-unsigned.apk
 
 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 && \
 	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/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/build-desktop.sh; \
-	$(MAKE) watchman-clean
-
 jsbundle-android: SHELL := /bin/sh
 jsbundle-android: export TARGET := android
 jsbundle-android: export BUILD_ENV ?= prod
 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/* ./
+	mv result/*.js ./
 
 jsbundle-ios: export TARGET := ios
 jsbundle-ios: export BUILD_ENV ?= prod
@@ -208,9 +248,9 @@ 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
 
-status-go-desktop: SHELL := /bin/sh
-status-go-desktop: ##@status-go Compile status-go for desktop app
-	nix/scripts/build.sh targets.status-go.desktop
+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, Build & Review changes
@@ -220,10 +260,6 @@ run-clojure: export TARGET := clojure
 run-clojure: ##@run Watch for and build Clojure changes for mobile
 	yarn shadow-cljs watch mobile
 
-run-clojure-desktop: export TARGET ?= $(HOST_OS)
-run-clojure-desktop: #@run Watch for and build Clojure changes for desktop
-	clj -R:dev build.clj watch --platform desktop
-
 run-metro: export TARGET := clojure
 run-metro: ##@run Start Metro to build React Native changes
 	@scripts/start-react-native.sh
@@ -237,7 +273,7 @@ run-android: export TARGET := android
 run-android: ##@run Build Android APK and start it on the device
 	npx react-native run-android --appIdSuffix debug
 
-SIMULATOR=
+SIMULATOR=iPhone 13
 run-ios: export TARGET := ios
 run-ios: ##@run Build iOS app and start it in a simulator/device
 ifneq ("$(SIMULATOR)", "")
@@ -246,50 +282,82 @@ else
 	npx react-native run-ios
 endif
 
-run-desktop: export TARGET ?= $(HOST_OS)
-run-desktop: ##@run Run Desktop build
-	npx react-native run-desktop
-
 #--------------
 # Tests
 #--------------
 
-lint: export TARGET := clojure
-lint: ##@test Run code style checks
-	yarn clj-kondo --confg .clj-kondo/config.edn --lint src && \
-	clojure -Sdeps '{:deps {cljfmt {:mvn/version "0.6.7"}}}' \
-		-m cljfmt.main check $$(git diff --diff-filter=d --cached --name-only src && echo src) \
-		--indents indentation.edn
+# 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-fix: export TARGET := clojure
+lint: export TARGET := default
+lint: ##@test Run code style checks
+	@sh scripts/lint-re-frame-in-quo-components.sh && \
+	clj-kondo --config .clj-kondo/config.edn --cache false --lint src && \
+	ALL_CLOJURE_FILES=$(call find_all_clojure_files) && \
+	zprint '{:search-config? true}' -sfc $$ALL_CLOJURE_FILES
+
+# NOTE: We run the linter twice because of https://github.com/kkinnear/zprint/issues/271
+lint-fix: export TARGET := default
 lint-fix: ##@test Run code style checks and fix issues
-	clojure -Sdeps '{:deps {cljfmt {:mvn/version "0.6.7"}}}' \
-		-m cljfmt.main fix src \
-		--indents indentation.edn
+	ALL_CLOJURE_FILES=$(call find_all_clojure_files) && \
+	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES && \
+	zprint '{:search-config? true}' -sw $$ALL_CLOJURE_FILES
+
+
+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
 
-coverage: ##@test Run tests once in NodeJS generating coverage
-	@scripts/run-coverage.sh
 
-#--------------
+run-visual-test-ios: export TARGET := clojure
+run-visual-test-ios: XCODE_DERIVED_DATA := $(HOME)/Library/Developer/Xcode/DerivedData
+run-visual-test-ios: APPLICATION_NAME := StatusIm-brfnruzfrkkycpbndmdoeyrigthc
+run-visual-test-ios: export TEST_BINARY_PATH := $(XCODE_DERIVED_DATA)/$(APPLICATION_NAME)/Build/Products/Debug-iphonesimulator/StatusIm.app
+run-visual-test-ios: ##@test Run tests once in NodeJS
+	detox test --configuration ios.sim.debug
+
+component-test-watch: export TARGET := clojure
+component-test-watch: export COMPONENT_TEST := true
+component-test-watch: export BABEL_ENV := test
+component-test-watch: ##@ Watch tests and re-run no changes to cljs files
+	yarn install
+	nodemon --exec 'yarn shadow-cljs compile component-test && jest --config=test/jest/jest.config.js' -e cljs
+
+component-test: export TARGET := clojure
+component-test: export COMPONENT_TEST := true
+component-test: export BABEL_ENV := test
+component-test: ##@test Run component tests once in NodeJS
+	yarn install
+	yarn shadow-cljs compile component-test && \
+	jest --config=test/jest/jest.config.js
+
 # Other
 #--------------
 
-start-desktop-server: export TARGET ?= $(HOST_OS)
-start-desktop-server: #@other Start ubuntu-server.js for desktop
-	node ubuntu-server.js
-
-react-native-desktop: export TARGET ?= $(HOST_OS)
-react-native-desktop: export _NIX_PURE ?= true
-react-native-desktop: ##@other Start react native packager
-	@scripts/start-react-native.sh
-
-geth-connect: export TARGET := android-env
+geth-connect: export TARGET := android-sdk
 geth-connect: ##@other Connect to Geth on the device
 	adb forward tcp:8545 tcp:8545 && \
 	build/bin/geth attach http://localhost:8545
@@ -299,22 +367,22 @@ 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-env
+android-ports: export TARGET := android-sdk
 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-env
+android-devices: export TARGET := android-sdk
 android-devices: ##@other Invoke adb devices
 	adb devices
 
-android-logcat: export TARGET := android-env
-android-logcat: ##@other Read status-react logs from Android phone using adb
+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-env
+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

README.md

@@ -1,17 +1,20 @@
-
 # 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-mobile/releases)
+
 Join us in creating a browser, messenger, and gateway to a decentralized world. Status is a free (libre) open source mobile client targeting Android & iOS built entirely on [Ethereum](https://ethereum.org/) technologies. That's right, no middle men and `go-ethereum` running directly on your device.
 
 [![Getting started with Status](https://i.imgur.com/C0aZZEL.jpg)](https://www.youtube.com/watch?v=oDCSEmS9c3o "Getting started with Status")
 
 ## Why?
 
-We believe in a medium of pure free trade, economies with fair, permission-less access and a world without intermediaries. We want to create policies that can exist between friends or scale globally, we want to communicate securely and be uninhibited by legacy systems.   
+We believe in a medium of pure free trade, economies with fair, permission-less access and a world without intermediaries. We want to create policies that can exist between friends or scale globally, we want to communicate securely and be uninhibited by legacy systems.
 
 We want to take responsibility for our data, the way we conduct ourselves privately and promote this way of life to a mass audience.
 
-We want deep insights into our own economies so we can make informed, data-driven decisions on how to make our lives better. The Ethereum blockchain, Smart Contracts, Swarm and Whisper provides us a path forward.  
+We want deep insights into our own economies so we can make informed, data-driven decisions on how to make our lives better. The Ethereum blockchain, Smart Contracts, Swarm and Whisper provides us a path forward.
 
 If this interests you, **help us make Status a reality** - anyone can contribute and we need everyone at any skill level to participate.
 
@@ -19,29 +22,37 @@ If this interests you, **help us make Status a reality** - anyone can contribute
 
 Go straight to the [docs](https://status.im/docs) or [join our chat](https://join.status.im/chat/public/status) and choose what interests you:
 
-- **Developer**
-Developers are the heart of software and to keep Status beating we need all the help we can get! If you're looking to code in ClojureScript or Golang then Status is the project for you! We use React Native and there is even some Java/Objective-C too!  
-Want to learn more about it? Start by reading our [Developer Introduction](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.
+- **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-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](https://status.im/technical/build_status/), which talks about managing
+project dependencies, coding guidelines and testing procedures. The [doc/](doc/)
+directory also has valuable information for contributors.
 
-- **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)
+- **Community Management**
+Metcalfe's law states that the value of a network is proportional to the square of the number of connected users of the system - without community Status is meaningless. We're looking to create a positive, fun environment to explore new ideas, experiment and grow the Status community. Building a community takes a lot of work but the people you'll meet and long lasting relationships you form will be well worth it, check out our [Mission and Community Principles](https://status.im/about)
 
-- **Specification / Documentation**  
+- **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**  
+- **Blog Writing**
 Content is King, keeping our blog up to date and informing the community of news helps keep everyone on the same page. [Jump into our chat](https://join.status.im/chat/public/status) and discuss with the team how you can contribute!
 
-- **Testers**  
-It's bug hunting season! Status is currently under active development and there is sure to be a bunch of learning, [build status from scratch](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!
+- **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](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-mobile/issues). Every bug you find brings Status closer to stable, usable software for everyone to enjoy!
 
-- **Security**  
+- **Security**
 Status is a visual interface to make permanent changes on the Blockchain, it handles crypto-tokens that have real value and allows 3rd party code execution. Security is paramount to its success. You are given permission to break Status as hard as you can, as long as you share your findings with the community!
 
-- **Evangelism**  
+- **Evangelism**
 Help us spread the word! Tell a friend *right now*, in fact tell **everyone** - yell from a mountain if you have to, every person counts! If you've got a great story to tell or have some interesting way you've spread the word about Status let us know about it in our [chat](https://join.status.im/chat/public/status)
 
-## Status API 
+## 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!
@@ -61,10 +72,8 @@ Feel free to email us at [support@status.im](mailto:support@status.im) or better
 
 ## License
 
-Licensed under the [Mozilla Public License v2.0](https://github.com/status-im/status-react/blob/develop/LICENSE.md)
+Licensed under the [Mozilla Public License v2.0](https://github.com/status-im/status-mobile/blob/develop/LICENSE.md)
 
 ## Testing Supported by
 
 [![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=SFBWQ3k5R2tnT2t6UGsxU1h1U0g3VFlCNnoxVTRHYWNoTDhsb1laaTJZWT0tLUZMUm5sSVFBSU9qSWM1RUJvK1I3Z3c9PQ==--ad15ae7992b432b33743749d40318952415bd98f)](https://www.browserstack.com/automate/public-build/SFBWQ3k5R2tnT2t6UGsxU1h1U0g3VFlCNnoxVTRHYWNoTDhsb1laaTJZWT0tLUZMUm5sSVFBSU9qSWM1RUJvK1I3Z3c9PQ==--ad15ae7992b432b33743749d40318952415bd98f)
-
-[![Coverage Status](https://coveralls.io/repos/github/status-im/status-react/badge.svg?)](https://coveralls.io/github/status-im/status-react)

RELEASE.md

@@ -1,11 +0,0 @@
-# Description
-
-This document explains some of the steps that are involved in relseases.
-
-## PlayStore Metadata Updates
-
-You can update Play Store releae metadata using `fastlane android upload_metadata`.
-
-But that requires credentials necessary for accessing Play Store API. The simpler way is to edit files contained within [`fastlane/metadata`](metadata) and run the following CI job:
-
-https://ci.status.im/job/status-tools/job/update-playstore-metadata/

VERSION

@@ -1 +1 @@
-1.4.1
+1.21.0

android/app/build.gradle

@@ -76,13 +76,22 @@ import com.sun.org.apache.xalan.internal.xsltc.compiler.Copy
  *   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: true,
+    enableHermes: !disableHermes,
     /* Disable 'The first definition was here.' warnings */
     hermesFlagsRelease: ["-w"],
     bundleInPr: true,
@@ -123,6 +132,13 @@ def jscFlavor = 'org.webkit:android-jsc:+'
  */
 def enableHermes = project.ext.react.get("enableHermes", false);
 
+def getCommitHash = { ->
+    if (project.hasProperty("commitHash")) {
+        return project.commitHash
+    }
+    return "unknown"
+}
+
 def getVersionCode = { ->
     new ByteArrayOutputStream().withStream { stdOut ->
         if (project.hasProperty("versionCode")) {
@@ -143,7 +159,10 @@ def getVersionName = { ->
         if (project.hasProperty("releaseVersion")) {
             return project.releaseVersion
         }
-        version = new File('../VERSION').text
+        /* 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
         return version.replaceAll("\\s","")
     }
 }
@@ -179,6 +198,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 {
@@ -221,21 +241,6 @@ android {
         jumboMode true
         javaMaxHeapSize "8g"
     }
-    signingConfigs {
-        debug {
-            storeFile file('debug.keystore')
-            storePassword 'android'
-            keyAlias 'androiddebugkey'
-            keyPassword 'android'
-        }
-        release {
-            /* environment variables take precedence over gradle.properties file */
-            storeFile     file(getEnvOrConfig('KEYSTORE_PATH').replaceAll("~", System.properties['user.home']))
-            storePassword getEnvOrConfig('KEYSTORE_PASSWORD')
-            keyAlias      getEnvOrConfig('KEYSTORE_ALIAS')
-            keyPassword   getEnvOrConfig('KEYSTORE_KEY_PASSWORD')
-        }
-    }
     splits {
         abi {
             reset()
@@ -244,20 +249,26 @@ android {
             universalApk true
         }
     }
+    signingConfigs {
+        debug {
+            storeFile file('debug.keystore')
+            storePassword 'android'
+            keyAlias 'androiddebugkey'
+            keyPassword 'android'
+        }
+    }
     buildTypes {
         debug {
             applicationIdSuffix ".debug"
             debuggable          true
             versionNameSuffix   "-SNAPSHOT"
-            signingConfig signingConfigs.debug
             resValue "string", "build_config_package", "im.status.ethereum"
+            signingConfig signingConfigs.debug
         }
         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
+            signingConfig null
         }
         pr {
             initWith release
@@ -299,6 +310,7 @@ dependencies {
     implementation "com.facebook.react:react-native:+"  // From node_modules
 
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+    implementation "androidx.core:core-splashscreen:1.0.0"
 
     debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
         exclude group:'com.facebook.fbjni'
@@ -326,6 +338,7 @@ dependencies {
 
     implementation 'androidx.multidex:multidex:2.0.1' // only needed if minSdkVersion is less than 21 (https://developer.android.com/studio/build/multidex)
     implementation project(':react-native-dialogs')
+    implementation project(':react-native-blur')
     // Force using exact RN version instead of relying on gradle dependency resolution
     // https://docs.gradle.org/current/userguide/introduction_dependency_management.html#sec:dependency_resolution
     // NOTE: Uncomment if building RN from a fork
@@ -333,8 +346,9 @@ dependencies {
     implementation project(':react-native-status')
     implementation project(':react-native-status-keycard')
     implementation 'com.github.status-im:function:0.0.1'
-    implementation 'com.facebook.fresco:fresco:2.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 = { ->
@@ -356,7 +370,7 @@ task hemroidBuild(type: Exec) {
     def localNdkDir = getLocalNDKDir()
     def ndkDir = System.env.ANDROID_NDK_ROOT
     if (localNdkDir != null) {
-        ndkDir = localNdkDir 
+        ndkDir = localNdkDir
     }
 
     def execPath = "$ndkDir/ndk-build"

android/app/proguard-rules.pro

@@ -64,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 *;
+}

android/app/src/debug/AndroidManifest.xml

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

android/app/src/main/AndroidManifest.xml

@@ -17,29 +17,28 @@
     <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"
             android:allowBackup="false"
             android:label="@string/app_name"
             android:icon="@mipmap/ic_launcher"
-            android:theme="@style/AppTheme"
+            android:theme="@style/Theme.AppSplash"
             android:name=".MainApplication"
             android:largeHeap="true"
-            android:usesCleartextTraffic="true"
-            android:requestLegacyExternalStorage="true">
+            android:usesCleartextTraffic="true">
+        <meta-data android:name="commitHash" android:value="${commitHash}"/>
         <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|screenSize|uiMode"
@@ -72,7 +71,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"

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

@@ -21,23 +21,30 @@ 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.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 androidx.core.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{
 
 
     @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();
@@ -97,6 +104,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);
@@ -107,18 +124,8 @@ 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);
-        }
+        SplashScreen splashScreen = SplashScreen.installSplashScreen(this);
+        setTheme(R.style.DarkTheme);
         // Make sure we get an Alert for every uncaught exceptions
         registerUncaughtExceptionHandler(MainActivity.this);
 
@@ -127,7 +134,7 @@ public class MainActivity extends ReactFragmentActivity
         Log.v("RNBootstrap", "Available system memory "+getAvailableMemory(activityManager).availMem + ", maximum usable application memory " + activityManager.getLargeMemoryClass()+"M");
 
         setSecureFlag();
-        SplashScreen.show(this, true);
+
         // NOTE: Try to not restore the state https://github.com/software-mansion/react-native-screens/issues/17
         super.onCreate(null);
 
@@ -167,9 +174,24 @@ 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);
+                }
             }
         };
 
+        splashScreen.setKeepOnScreenCondition(() -> keepSplash);
+
+        Handler handler = new Handler();
+        handler.postDelayed(() -> keepSplash = false, SPLASH_DELAY);
+
         StatusThreadPoolExecutor.getInstance().execute(r);
     }
 
@@ -178,14 +200,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) {
@@ -199,7 +214,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;
@@ -242,14 +257,4 @@ public class MainActivity extends ReactFragmentActivity
             mPermissionListener = null;
         }
     }
-
-    @Override
-    protected ReactActivityDelegate createReactActivityDelegate() {
-        return new ReactActivityDelegate(this, getMainComponentName()) {
-            @Override
-            protected ReactRootView createRootView() {
-                return new RNGestureHandlerEnabledRootView(MainActivity.this);
-            }
-        };
-    }
 }

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

@@ -9,19 +9,28 @@ 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.soloader.SoLoader;
 import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.modules.network.OkHttpClientProvider;
+import com.reactnativecommunity.blurview.BlurViewPackage;
 
 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 {
+import com.facebook.react.bridge.JSIModulePackage;
+import com.swmansion.reanimated.ReanimatedJSIModulePackage;
 
-    private final ReactNativeHost mReactNativeHost = new ReactNativeHost(this) {
+public class MainApplication extends NavigationApplication {
+
+    private final ReactNativeHost mReactNativeHost = new NavigationReactNativeHost(this) {
         @Override
         public boolean getUseDeveloperSupport() {
             return BuildConfig.DEBUG;
@@ -30,10 +39,13 @@ 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 PushNotificationPackage());
+            packages.add(new BlurViewPackage());
             return packages;
         }
 
@@ -41,6 +53,11 @@ public class MainApplication extends MultiDexApplication implements ReactApplica
         protected String getJSMainModuleName() {
             return "index";
         }
+
+	@Override
+	protected JSIModulePackage getJSIModulePackage() {
+	    return new ReanimatedJSIModulePackage();
+	}
     };
 
     @Override
@@ -51,7 +68,9 @@ 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());
     }

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

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

android/app/src/main/res/layout/launch_screen.xml

@@ -1,16 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="?attr/backgroundColor">
 
-    <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_gravity="center"
-            android:scaleType="fitCenter"
-            android:src="@drawable/launch_logo"/>
-
-</FrameLayout>
+      <com.airbnb.lottie.LottieAnimationView
+        android:id="@+id/lottie"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:layout_gravity="center"
+        android:scaleType="fitCenter"
+        android:adjustViewBounds="true"
+        app:lottie_rawRes="@raw/launching_animation"
+        app:lottie_autoPlay="true"
+        app:lottie_loop="true"
+        />
+</FrameLayout>

android/app/src/main/res/values-night/colors.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="alert_background">#141414</color>
+    <color name="alert_text">#ffffff</color>
+</resources>

android/app/src/main/res/values/colors.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="alert_background">#ffffff</color>
+  <color name="alert_text">#000000</color>
+  <color name="splash_background">#09101C</color>
+  <color name="splash_status_bar_color">#ffffff</color>
+</resources>

android/app/src/main/res/values/splash_theme.xml

@@ -0,0 +1,13 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <style name="Theme.AppSplash" parent="Theme.SplashScreen">
+        <item name="windowSplashScreenBackground">@color/splash_background</item>
+        <item name="windowSplashScreenAnimatedIcon">@drawable/splash_logo</item>
+        <item name="windowSplashScreenAnimationDuration">1000</item>
+
+        <!-- Status bar and Nav bar configs -->
+        <item name="android:statusBarColor" tools:targetApi="l">@color/splash_background</item>
+        <item name="android:windowLightStatusBar">false</item>
+
+        <item name="postSplashScreenTheme">@style/DarkTheme</item>
+    </style>
+</resources>

android/app/src/main/res/values/styles.xml

@@ -8,6 +8,7 @@
         <item name="android:forceDarkAllowed">true</item>
         <item name="android:windowTranslucentStatus">false</item>
         <item name="android:statusBarColor">?attr/backgroundColor</item>
+	<item name="android:alertDialogTheme">@style/AlertDialogTheme</item>
     </style>
 
     <style name="LightTheme" parent="AppTheme">
@@ -21,4 +22,10 @@
         <item name="backgroundColor">#000000</item>
         <item name="android:windowLightStatusBar">false</item>
     </style>
+
+    <style name="AlertDialogTheme" parent="Theme.AppCompat.DayNight.Dialog.Alert">
+        <item name="android:textColor">@color/alert_text</item>
+        <item name="android:textColorPrimary">@color/alert_text</item>
+        <item name="android:background">@color/alert_background</item>
+    </style>
 </resources>

android/app/src/pr/AndroidManifest.xml

@@ -3,5 +3,7 @@
 
     <!-- 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"/>
 
 </manifest>

android/app/src/release/AndroidManifest.xml

@@ -3,5 +3,7 @@
 
     <!-- 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"/>
 
-</manifest>
+</manifest>

android/build.gradle

@@ -4,6 +4,7 @@
 * Project-wide gradle configuration properties for use by all modules
 */
 ext {
+    RNNKotlinVersion    = "1.4.31"
     buildToolsVersion   = project.buildToolsVersion
     minSdkVersion       = Integer.valueOf(project.minSdkVersion)
     compileSdkVersion   = Integer.valueOf(project.compileSdkVersion)
@@ -16,9 +17,10 @@ buildscript {
     repositories {
         flatDir { dirs "libs", "${rootDir}/app/libs" }
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31"
         classpath "com.android.tools.build:gradle:${project.ext.gradlePluginVersion}"
         // WARNING: Do not place your application dependencies here!
         //          They belong in the individual module build.gradle files.
@@ -42,27 +44,23 @@ subprojects {
 
 allprojects {
     beforeEvaluate {
-      if (System.env.STATUS_GO_ANDROID_LIBDIR == null || System.env.STATUS_GO_ANDROID_LIBDIR == "") {
-        throw new GradleException('STATUS_GO_ANDROID_LIBDIR environment variable is not valid!')
-      }
+        if (System.env.STATUS_GO_ANDROID_LIBDIR == null || System.env.STATUS_GO_ANDROID_LIBDIR == "") {
+            throw new GradleException('STATUS_GO_ANDROID_LIBDIR environment variable is not valid!')
+        }
     }
 
     repositories {
         mavenLocal()
-        maven {
-            // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-            url("$rootDir/../node_modules/react-native/android")
-        }
-        maven {
-            // Android JSC is installed from npm
-            url("$rootDir/../node_modules/jsc-android/dist")
-        }
-
-        google()
-        jcenter()
-
-        // for geth, function, and status-go
+        // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
+        maven { url("$rootDir/../node_modules/react-native/android") }
+        // Android JSC is installed from npm
+        maven { url("$rootDir/../node_modules/jsc-android/dist") }
+        // For geth, function, and status-go
         flatDir { dirs "libs", System.env.STATUS_GO_ANDROID_LIBDIR }
+        // Everything Else
+        google()
+        jcenter() // Required for @react-native-community/blur:3.6.1, can be removed after updating to 3.6.1+
+        mavenCentral()
         maven { url "https://www.jitpack.io" }
     }
 }

android/gradle.properties

@@ -23,12 +23,12 @@
 # Version requirements used throughout the Gradle scripts
 kotlinVersion=1.3.50
 minSdkVersion=23
-compileSdkVersion=29
-targetSdkVersion=29
-buildToolsVersion=29.0.2
+compileSdkVersion=31
+targetSdkVersion=31
+buildToolsVersion=31.0.0
 supportLibVersion=28.0.0
 # This should match version from nix/mobile/android/maven-and-npm-deps/maven/default.nix
-gradlePluginVersion=3.5.3
+gradlePluginVersion=3.5.4
 
 android.useAndroidX=true
 android.enableJetifier=true
@@ -46,6 +46,7 @@ ANDROID_ABI_INCLUDE=armeabi-v7a;arm64-v8a;x86
 org.gradle.jvmargs=-Xmx8704M
 
 versionCode=9999
+commitHash=unknown
 
 # Flipper
-FLIPPER_VERSION=0.35.0
+FLIPPER_VERSION=0.54.0

android/settings.gradle

@@ -1,4 +1,6 @@
 pluginManagement {
+include ':react-native-share'
+project(':react-native-share').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-share/android')
   repositories {
       mavenLocal() // Let's prioritize local Maven repos so that Nix can provide them offline
       gradlePluginPortal()
@@ -16,3 +18,5 @@ include ':react-native-status'
 project(':react-native-status').projectDir = new File(rootProject.projectDir, '../modules/react-native-status/android')
 include ':react-native-status-keycard'
 project(':react-native-status-keycard').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-status-keycard/android')
+include ':react-native-blur'
+project(':react-native-blur').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/blur/android')

babel.config.js

@@ -0,0 +1,24 @@
+module.exports = {
+
+    "presets": [
+        "module:metro-react-native-babel-preset"
+    ],
+    "plugins": [
+        "react-native-reanimated/plugin"
+    ],
+    "env": {
+        "test": {
+            "presets": [
+                '@babel/preset-react',
+                [
+                    '@babel/preset-env',
+                    {
+                        targets: {
+                            node: '14',
+                        },
+                    },
+                ],
+            ],
+        }
+    }
+}

binding.gyp

@@ -0,0 +1,38 @@
+{
+  "variables": {
+    "module_name%": "status_nodejs_addon",
+    "module_path%": "./lib/binding/"
+  },
+  "targets": [{
+    "target_name": "<(module_name)",
+    "sources": [
+      "./modules/react-native-status/nodejs/status.cpp"
+    ],
+    "xcode_settings": {
+      "MACOSX_DEPLOYMENT_TARGET": "10.7"
+    },
+    "libraries": [
+      "<!(pwd)/result/libstatus.a"
+    ],
+    "conditions": [
+      ["OS=='mac'", {
+        "libraries": [
+          "-framework IOKit",
+          "-framework CoreFoundation",
+          "-framework CoreServices",
+          "-framework Security"
+        ]
+      }]
+    ]
+  }, {
+    "target_name": "action_after_build",
+    "type": "none",
+    "dependencies": ["<(module_name)"],
+    "copies": [
+      {
+        "files": [ "<(PRODUCT_DIR)/<(module_name).node" ],
+        "destination": "<(module_path)"
+      }
+    ]
+  }]
+}

ci/Jenkinsfile.android

@@ -1,12 +1,15 @@
-library 'status-react-jenkins@v1.1.7'
+library 'status-jenkins-lib@v1.6.9'
+
+/* Options section can't access functions in objects. */
+def isPRBuild = utils.isPRBuild()
 
 pipeline {
-  agent { label 'linux' }
+  agent { label 'linux && x86_64 && nix-2.11' }
 
   options {
     timestamps()
     /* Prevent Jenkins jobs from running forever */
-    timeout(time: 45, unit: 'MINUTES')
+    timeout(time: 30, unit: 'MINUTES')
     /* Limit builds retained */
     buildDiscarder(logRotator(
       numToKeepStr: '10',
@@ -14,7 +17,11 @@ pipeline {
       artifactNumToKeepStr: '10',
     ))
     /* Allows combined build to copy */
-    copyArtifactPermission('/status-react/*')
+    copyArtifactPermission('/status-mobile/*')
+    /* Abort old PR builds. */
+    disableConcurrentBuilds(
+      abortPrevious: isPRBuild
+    )
   }
 
   parameters {
@@ -29,7 +36,7 @@ pipeline {
     LANG     = "en_US.UTF-8"
     LC_ALL   = "en_US.UTF-8"
     LANGUAGE = "en_US.UTF-8"
-    TARGET   = 'android'
+    TARGET   = "android${utils.isE2EBuild() ? "-e2e" : ""}"
     BUILD_ENV = 'prod'
     NIX_CONF_DIR = "${env.WORKSPACE}/nix"
     FASTLANE_DISABLE_COLORS = 1
@@ -42,46 +49,20 @@ pipeline {
     stage('Prep') {
       steps {
         script {
-          btype = utils.getBuildType()
-          print "Running ${btype} build!"
-          jenkins.abortPreviousRunningBuilds()
-          /* Cleanup and Prep */
-          commonPrep(btype)
+          utils.doGitRebasePR()
+          utils.symlinkEnv()
+          println("Build Number: ${utils.genBuildNumber()}")
         }
       }
     }
-    stage('Parallel Assemble') {
-      parallel {
-        stage('Checks') { stages {
-          stage('Lint') {
-            steps {
-              script {
-                /* We want the build result to be uploaded */
-                catchError(
-                  message: 'Linting check failed!',
-                  buildResult: 'FAILURE',
-                  stageResult: 'FAILURE'
-                ) {
-                  sh 'make lint'
-                }
-              }
-            }
-          }
-          stage('Tests') {
-            steps {
-              script {
-                sh 'make test'
-              }
-            }
-          }
-        } }
-        stage('Build') { stages {
-          stage('Bundle') {
-            steps {
-              script { apks = android.bundle() }
-            }
-          }
-        } }
+    stage('Bundle') {
+      steps {
+        script { apks = android.bundle() }
+      }
+    }
+    stage('Sign') {
+      steps {
+        script { apks = android.sign(apks) }
       }
     }
     stage('Parallel Upload') {
@@ -92,36 +73,22 @@ pipeline {
           } }
         }
         stage('Upload') {
-          steps {
-            script {
-              def urls = apks.collect { s3.uploadArtifact(it) }
-              /* return only the universal APK */
-              if (urls.size() > 1) { 
-                env.PKG_URL = urls.find { it.contains('universal') }
-              } else { /* if no universal is available pick first */
-                env.PKG_URL = urls.first()
-              }
-              /* build type specific */
-              switch (btype) {
-                case 'nightly':
-                  env.DIAWI_URL = android.uploadToDiawi(); break;
-                case 'e2e':
-                  env.SAUCE_URL = android.uploadToSauceLabs(); break;
-              }
+          steps { script {
+            def urls = apks.collect { s3.uploadArtifact(it) }
+            if (urls.size() > 1) { /* Return only the universal APK. */
+              env.PKG_URL = urls.find { it.contains('universal') }
+            } else { /* If no universal is available pick first. */
+              env.PKG_URL = urls.first()
             }
-          }
+            jenkins.setBuildDesc(APK: env.PKG_URL)
+          } }
         }
       }
     }
-    stage('Cleanup') {
-      steps {
-        sh 'make clean'
-      }
-    }
   }
   post {
     success { script { github.notifyPR(true) } }
     failure { script { github.notifyPR(false) } }
-    always { sh 'make _fix-node-perms' }
+    always  { sh 'make purge' }
   }
 }

ci/Jenkinsfile.combined

@@ -1,4 +1,4 @@
-library 'status-react-jenkins@v1.1.7'
+library 'status-jenkins-lib@v1.6.9'
 
 pipeline {
   agent { label 'linux' }
@@ -7,7 +7,9 @@ pipeline {
     timestamps()
     disableConcurrentBuilds()
     /* Prevent Jenkins jobs from running forever */
-    timeout(time: 45, unit: 'MINUTES')
+    timeout(time: 40, unit: 'MINUTES')
+    /* Allow copying of artifacts from this job. */
+    copyArtifactPermission('/status-mobile/e2e/*')
     /* Limit builds retained */
     buildDiscarder(logRotator(
       numToKeepStr: '10',
@@ -16,10 +18,24 @@ pipeline {
     ))
   }
 
+  /* WARNING: Defining parameters here with the ?: trick causes them to remember last value. */
+  parameters { 
+    choice(
+      name: 'BUILD_TYPE',
+      description: 'Makefile target to build. Optional Parameter.',
+      choices: genChoices(params.BUILD_TYPE, ['manual', 'nightly', 'release', 'pr', 'e2e']),
+    )
+    booleanParam(
+      name: 'PUBLISH',
+      description: 'Trigger publishing of build results for nightly or release.',
+      defaultValue: getPublishDefault(params.PUBLISH),
+    )
+  }
+
   stages {
     stage('Prep') {
       steps { script {
-        println "Current JOB: ${env.JOB_NAME}"
+        println("Current JOB: ${env.JOB_NAME}")
         /* just for a shorter access */
         btype = utils.getBuildType()
       } }
@@ -27,13 +43,16 @@ pipeline {
     stage('Build') {
       parallel {
         stage('iOS') { steps { script {
-          ios = jenkins.Build('status-react/combined/mobile-ios')
+          ios = jenkins.Build('status-mobile/platforms/ios')
         } } }
         stage('Android') { steps { script {
-          apk = jenkins.Build('status-react/combined/mobile-android')
+          apk = jenkins.Build('status-mobile/platforms/android')
         } } }
         stage('Android e2e') { steps { script {
-          apke2e = jenkins.Build('status-react/combined/mobile-android-e2e')
+          apke2e = jenkins.Build('status-mobile/platforms/android-e2e')
+        } } }
+        stage('Tests') { steps { script {
+          jenkins.Build('status-mobile/platforms/tests')
         } } }
       }
     }
@@ -44,9 +63,10 @@ pipeline {
         //jenkins.copyArts(iose2e)
         jenkins.copyArts(apk)
         jenkins.copyArts(apke2e)
+        sha = "pkg/${utils.pkgFilename(ext: 'sha256')}"
         dir('pkg') {
           /* generate sha256 checksums for upload */
-          sh "sha256sum * | tee ${utils.pkgFilename(btype, 'sha256')}"
+          sh "sha256sum * | tee ../${sha}"
           archiveArtifacts('*')
         }
       } }
@@ -58,37 +78,60 @@ pipeline {
           /* mobile */
           Apk: utils.pkgUrl(apk), Apke2e: utils.pkgUrl(apke2e),
           iOS: utils.pkgUrl(ios), /*iOSe2e: utils.pkgUrl(iose2e),*/
-          Diawi: utils.utils.getEnv(ios, 'DIAWI_URL'),
+          Diawi: utils.getEnv(ios, 'DIAWI_URL'),
           /* upload the sha256 checksums file too */
-          SHA: s3.uploadArtifact(utils.pkgFind('sha256')),
+          SHA: s3.uploadArtifact(sha),
         ]
         /* add URLs to the build description */
         jenkins.setBuildDesc(urls)
-        /* Create JSON file with newest build URLs */
-        switch (btype) {
-          /* legacy naming, should have named it nightly.json */
-          case 'nightly': s3.updateBucketJSON(urls, 'latest.json'); break
-        }
       } }
     }
     stage('Publish') {
+      when { expression { params.PUBLISH } }
       steps { script {
         switch (btype) {
-          case 'nightly': build(job: 'misc/status.im', wait: false); break
-          case 'release': github.publishReleaseMobile(); break
+          case 'nightly':
+            /* Create JSON file with newest build URLs */
+            s3.updateBucketJSON(urls, 'latest.json');
+            build(job: 'website/status.im', wait: false);
+            break;
+          case 'release':
+            github.publishReleaseFiles(repo: 'status-mobile');
+            break;
         }
       } }
     }
     stage('Run e2e') {
-      when { expression { btype == 'nightly' } }
+      when { expression { btype == 'nightly' && params.PUBLISH } }
       steps { script {
         e2eApk = utils.getEnv(apke2e, 'SAUCE_URL')
         build(
-          job: 'end-to-end-tests/status-app-nightly',
-          parameters: [string(name: 'APK_NAME', value: e2eApk)],
+          job: 'status-mobile/e2e/status-app-nightly',
+          parameters: [string(name: 'APK_URL', value: e2eApk)],
           wait: false
         )
       } }
     }
   }
 }
+
+/* Helper that generates list of available choices for a parameter
+ * but re-orders them based on the currently set value. First is default. */
+def List genChoices(String previousChoice, List defaultChoices) {
+  if (previousChoice == null) {
+     return defaultChoices
+  }
+  choices = defaultChoices.minus(previousChoice)
+  choices.add(0, previousChoice)
+  return choices
+}
+
+/* Helper that makes PUBLISH default to 'false' unless:
+ * - The build is for a release branch
+ * - A user explicitly specified a value
+ * Since release builds create and re-create GitHub drafts every time. */
+def Boolean getPublishDefault(Boolean previousValue) {
+  if (env.JOB_NAME.startsWith('status-mobile/release')) { return true }
+  if (previousValue != null) { return previousValue }
+  return false
+}

ci/Jenkinsfile.ios

@@ -1,7 +1,10 @@
-library 'status-react-jenkins@v1.1.7'
+library 'status-jenkins-lib@v1.6.9'
+
+/* Options section can't access functions in objects. */
+def isPRBuild = utils.isPRBuild()
 
 pipeline {
-  agent { label 'macos-xcode-11.5' }
+  agent { label 'macos && arm64 && nix-2.11 && xcode-14.2' }
 
   parameters {
     string(
@@ -14,7 +17,7 @@ pipeline {
   options {
     timestamps()
     /* Prevent Jenkins jobs from running forever */
-    timeout(time: 45, unit: 'MINUTES')
+    timeout(time: 25, unit: 'MINUTES')
     /* Limit builds retained */
     buildDiscarder(logRotator(
       numToKeepStr: '10',
@@ -22,7 +25,11 @@ pipeline {
       artifactNumToKeepStr: '10',
     ))
     /* Allows combined build to copy */
-    copyArtifactPermission('/status-react/*')
+    copyArtifactPermission('/status-mobile/*')
+    /* Abort old PR builds. */
+    disableConcurrentBuilds(
+      abortPrevious: isPRBuild
+    )
   }
 
   environment {
@@ -41,51 +48,23 @@ pipeline {
     stage('Prep') {
       steps {
         script {
-          btype = utils.getBuildType()
-          print "Running ${btype} build!"
-          jenkins.abortPreviousRunningBuilds()
-          /* Cleanup and Prep */
-          commonPrep(btype)
+          utils.doGitRebasePR()
+          utils.symlinkEnv()
+          println("Build Number: ${utils.genBuildNumber()}")
         }
       }
     }
-    stage('Parallel Assemble') {
-      parallel {
-        stage('Checks') { stages {
-          stage('Lint') {
-            steps {
-              script {
-                /* We want the build result to be uploaded */
-                catchError(
-                  message: 'Linting check failed!',
-                  buildResult: 'FAILURE',
-                  stageResult: 'FAILURE'
-                ) {
-                  sh 'make lint'
-                }
-              }
-            }
-          }
-          stage('Tests') {
-            steps {
-              script {
-                sh 'make test'
-              }
-            }
-          }
-        } }
-        stage('Build') { stages {
-          stage('JSBundle') {
-            steps {
-              script { ios.jsbundle() }
-            }
-          }
-          stage('Bundle') {
-            steps {
-              script { api = ios.bundle() }
-            }
-          }
-        } }
+    stage('JSBundle') {
+      steps {
+        script { ios.jsbundle() }
+      }
+    }
+    stage('Bundle') {
+      steps {
+        script { api = ios.bundle() }
+      }
+      post {
+        failure { archiveArtifacts 'ios/logs/*' }
       }
     }
     stage('Parallel Upload') {
@@ -96,30 +75,19 @@ pipeline {
           }
         }
         stage('Upload') {
-          steps {
-            script {
-              env.PKG_URL = s3.uploadArtifact(api)
-              /* e2e builds get tested in SauceLabs */
-              if (btype == 'e2e') {
-                env.SAUCE_URL = ios.uploadToSauceLabs()
-              } else {
-                env.DIAWI_URL = ios.uploadToDiawi()
-              }
-            }
-          }
+          when { expression { !utils.isReleaseBuild() } }
+          steps { script {
+            env.DIAWI_URL = ios.uploadToDiawi()
+            env.PKG_URL = env.DIAWI_URL
+            jenkins.setBuildDesc(IPA: env.PKG_URL)
+          } }
         }
       }
     }
-    stage('Cleanup') {
-      steps {
-        sh 'make watchman-clean'
-        sh 'make clean'
-      }
-    }
   }
   post {
     success { script { github.notifyPR(true) } }
     failure { script { github.notifyPR(false) } }
-    always { sh 'make _fix-node-perms' }
+    always  { sh 'make purge' }
   }
 }

ci/Jenkinsfile.linux

@@ -1,125 +0,0 @@
-library 'status-react-jenkins@v1.1.7'
-
-pipeline {
-  agent { label 'linux' }
-
-  parameters {
-    string(
-      name: 'BUILD_TYPE',
-      description: 'Specify build type. Values: pr / nightly / release',
-      defaultValue: 'pr',
-    )
-  }
-
-  options {
-    timestamps()
-    /* Prevent Jenkins jobs from running forever */
-    timeout(time: 40, unit: 'MINUTES')
-    /* Limit builds retained */
-    buildDiscarder(logRotator(
-      numToKeepStr: '10',
-      daysToKeepStr: '20',
-      artifactNumToKeepStr: '10',
-    ))
-    /* Allows combined build to copy */
-    copyArtifactPermission('/status-react/*')
-  }
-
-  /**
-   * WARNING: Jenkins ignores PATH changes in Docker
-   * https://issues.jenkins-ci.org/browse/JENKINS-49076
-   **/
-  environment {
-    LANG     = "en_US.UTF-8"
-    LC_ALL   = "en_US.UTF-8"
-    LANGUAGE = "en_US.UTF-8"
-    TARGET   = 'linux'
-    NIX_CONF_DIR = "${env.WORKSPACE}/nix"
-    VERBOSE_LEVEL = '3'
-    /* We use EXECUTOR_NUMBER to avoid multiple instances clashing */
-    YARN_CACHE_FOLDER = "/var/tmp/yarn-${EXECUTOR_NUMBER}"
-    GRADLE_USER_HOME  = "/var/tmp/gradle-${EXECUTOR_NUMBER}"
-  }
-
-  stages {
-    stage('Prep') {
-      steps {
-        script {
-          btype = utils.getBuildType()
-          print "Running ${btype} build!"
-          jenkins.abortPreviousRunningBuilds()
-          /* Cleanup and Prep */
-          commonPrep(btype)
-        }
-      }
-    }
-    stage('Parallel Assemble') {
-      parallel {
-        stage('Checks') { stages {
-          stage('Lint') {
-            steps {
-              script {
-                /* We want the build result to be uploaded */
-                catchError(
-                  message: 'Linting check failed!',
-                  buildResult: 'FAILURE',
-                  stageResult: 'FAILURE'
-                ) {
-                  sh 'make lint'
-                }
-              }
-            }
-          }
-          stage('Tests') {
-            steps {
-              script {
-                sh 'make test'
-              }
-            }
-          }
-        } }
-        stage('Build') { stages {
-          stage('JSBundle') {
-            steps {
-              script { desktop.buildJSBundle() }
-            }
-          }
-          stage('Compile') {
-            steps {
-              script { desktop.compile() }
-            }
-          }
-          stage('Bundle') {
-            steps {
-              script { app = desktop.bundleLinux(btype) }
-            }
-          }
-        } }
-      }
-    }
-    stage('Parallel Upload') {
-      parallel {
-        stage('Archive') {
-          steps {
-            archiveArtifacts app
-          }
-        }
-        stage('Upload') {
-          steps {
-            script { env.PKG_URL = s3.uploadArtifact(app) }
-          }
-        }
-      }
-    }
-    stage('Cleanup') {
-      steps {
-        sh 'make watchman-clean'
-        sh 'make clean'
-      }
-    }
-  }
-  post {
-    success { script { github.notifyPR(true) } }
-    failure { script { github.notifyPR(false) } }
-  }
-}

ci/Jenkinsfile.macos

@@ -1,123 +0,0 @@
-library 'status-react-jenkins@v1.1.7'
-
-pipeline {
-  agent { label 'macos-xcode-11.5' }
-
-  parameters {
-    string(
-      name: 'BUILD_TYPE',
-      description: 'Specify build type. Values: pr / nightly / release',
-      defaultValue: 'pr',
-    )
-  }
-
-  options {
-    timestamps()
-    /* Prevent Jenkins jobs from running forever */
-    timeout(time: 30, unit: 'MINUTES')
-    /* Limit builds retained */
-    buildDiscarder(logRotator(
-      numToKeepStr: '10',
-      daysToKeepStr: '20',
-      artifactNumToKeepStr: '10',
-    ))
-    /* Allows combined build to copy */
-    copyArtifactPermission('/status-react/*')
-  }
-
-  environment {
-    LANG     = "en_US.UTF-8"
-    LC_ALL   = "en_US.UTF-8"
-    LANGUAGE = "en_US.UTF-8"
-    TARGET   = 'macos'
-    NIX_CONF_DIR = "${env.WORKSPACE}/nix"
-    /* See nix/README.md */
-    NIX_IGNORE_SYMLINK_STORE = 1
-    VERBOSE_LEVEL = '3'
-    /* We use EXECUTOR_NUMBER to avoid multiple instances clashing */
-    YARN_CACHE_FOLDER = "/var/tmp/yarn-${EXECUTOR_NUMBER}"
-    GRADLE_USER_HOME  = "/var/tmp/gradle-${EXECUTOR_NUMBER}"
-  }
-
-  stages {
-    stage('Prep') {
-      steps {
-        script {
-          btype = utils.getBuildType()
-          print "Running ${btype} build!"
-          jenkins.abortPreviousRunningBuilds()
-          /* Cleanup and Prep */
-          commonPrep(btype)
-        }
-      }
-    }
-    stage('Parallel Assemble') {
-      parallel {
-        stage('Checks') { stages {
-          stage('Lint') {
-            steps {
-              script {
-                /* We want the build result to be uploaded */
-                catchError(
-                  message: 'Linting check failed!',
-                  buildResult: 'FAILURE',
-                  stageResult: 'FAILURE'
-                ) {
-                  sh 'make lint'
-                }
-              }
-            }
-          }
-          stage('Tests') {
-            steps {
-              script {
-                sh 'make test'
-              }
-            }
-          }
-        } }
-        stage('Build') { stages {
-          stage('JSBundle') {
-            steps {
-              script { desktop.buildJSBundle() }
-            }
-          }
-          stage('Compile') {
-            steps {
-              script { desktop.compile() }
-            }
-          }
-          stage('Bundle') {
-            steps {
-              script { dmg = desktop.bundleMacOS(btype) }
-            }
-          }
-        } }
-      }
-    }
-    stage('Parallel Upload') {
-      parallel {
-        stage('Archive') {
-          steps {
-            archiveArtifacts dmg
-          }
-        }
-        stage('Upload') {
-          steps {
-            script { env.PKG_URL = s3.uploadArtifact(dmg) }
-          }
-        }
-      }
-    }
-    stage('Cleanup') {
-      steps {
-        sh 'make watchman-clean'
-        sh 'make clean'
-      }
-    }
-  }
-  post {
-    success { script { github.notifyPR(true) } }
-    failure { script { github.notifyPR(false) } }
-  }
-}

ci/Jenkinsfile.nix-cache

@@ -1,16 +1,26 @@
-library 'status-react-jenkins@v1.1.7'
+library 'status-jenkins-lib@v1.6.9'
 
 pipeline {
   agent { label params.AGENT_LABEL }
 
+  parameters {
+    string(
+      name: 'NIX_CACHE_HOST',
+      description: 'FQDN of Nix binary cache host.',
+      defaultValue: params.NIX_CACHE_HOST ?: 'cache-01.do-ams3.nix.ci.statusim.net'
+    )
+    string(
+      name: 'NIX_CACHE_USER',
+      description: 'Username for Nix binary cache host.',
+      defaultValue: params.NIX_CACHE_USER ?: 'nix-cache'
+    )
+  }
+
   environment {
     /* See nix/README.md */
     NIX_IGNORE_SYMLINK_STORE = 1
     /* we source .bash_profile to be able to use nix-store */
-    NIX_SSHOPTS = "-o StrictHostKeyChecking=no source .bash_profile;"
-    /* where our /nix/store is hosted */
-    NIX_CACHE_USER = 'nix-cache'
-    NIX_CACHE_HOST = 'master-01.do-ams3.ci.misc.statusim.net'
+    NIX_SSHOPTS = "-o StrictHostKeyChecking=no source .profile;"
     NIX_CONF_DIR = "${env.WORKSPACE}/nix"
   }
 
@@ -29,14 +39,14 @@ pipeline {
   stages {
     stage('Setup') {
       steps { script {
-        nix.shell('nix-env -i openssh', pure: false)
+        nix.shell('nix-env -i openssh', sandbox: false, pure: false)
         /* some build targets don't build on MacOS */
         uname = sh(script: 'uname', returnStdout: true)
       } }
     }
     stage('Build status-go') {
       steps { script {
-        def platforms = ['mobile.android', 'mobile.ios', 'desktop']
+        def platforms = ['mobile.android', 'mobile.ios']
         if (uname != "Darwin") {
           platforms.removeAll { it == "ios" }
         }
@@ -87,8 +97,9 @@ pipeline {
         sshagent(credentials: ['nix-cache-ssh']) {
           nix.shell("""
               find /nix/store/ -mindepth 1 -maxdepth 1 -type d \
-                -not -name '*.links' -and -not -name '*-status-react-*' \
-                | xargs nix-copy-closure -v --to ${NIX_CACHE_USER}@${NIX_CACHE_HOST}
+                -not -name '*.links' -and -not -name '*-status-mobile-*' \
+                | xargs nix copy \
+                  --to ssh-ng://${params.NIX_CACHE_USER}@${params.NIX_CACHE_HOST}
             """,
             pure: false
           )

ci/Jenkinsfile.tests

@@ -0,0 +1,92 @@
+library 'status-jenkins-lib@v1.6.9'
+
+/* Options section can't access functions in objects. */
+def isPRBuild = utils.isPRBuild()
+
+pipeline {
+  agent { label 'linux && x86_64 && nix-2.11' }
+
+  options {
+    timestamps()
+    /* Prevent Jenkins jobs from running forever */
+    timeout(time: 10, unit: 'MINUTES')
+    /* Limit builds retained */
+    buildDiscarder(logRotator(
+      numToKeepStr: '10',
+      daysToKeepStr: '20',
+      artifactNumToKeepStr: '10',
+    ))
+    /* Abort old PR builds. */
+    disableConcurrentBuilds(
+      abortPrevious: isPRBuild
+    )
+  }
+
+  parameters {
+    string(
+      name: 'BUILD_TYPE',
+      description: 'Specify build type. Values: pr / e2e / nightly / release',
+      defaultValue: 'pr',
+    )
+  }
+
+  environment {
+    LANG     = "en_US.UTF-8"
+    LC_ALL   = "en_US.UTF-8"
+    LANGUAGE = "en_US.UTF-8"
+    TARGET   = 'tests'
+    BUILD_ENV = 'prod'
+    NIX_CONF_DIR = "${env.WORKSPACE}/nix"
+    LOG_FILE = utils.pkgFilename(ext: 'log', arch: 'tests')
+  }
+
+  stages {
+    stage('Prep') {
+      steps {
+        script {
+          utils.doGitRebasePR()
+        }
+      }
+    }
+    stage('Checks') {
+      parallel {
+        stage('Lint') {
+          steps {
+            sh """#!/bin/bash
+              set -eo pipefail
+              make lint 2>&1 | tee ${LOG_FILE}
+            """
+          }
+        }
+        stage('Tests') {
+          steps {
+            sh """#!/bin/bash
+              set -eo pipefail
+              make test 2>&1 | tee -a ${LOG_FILE}
+            """
+          }
+        }
+      }
+    }
+    stage('Component Tests') {
+      steps {
+        sh """#!/bin/bash
+          set -eo pipefail
+          make component-test 2>&1 | tee -a ${LOG_FILE}
+        """
+      }
+    }
+    stage('Upload') {
+      steps {
+        script {
+          env.PKG_URL = s3.uploadArtifact(LOG_FILE)
+        }
+      }
+    }
+  }
+  post {
+    success { script { github.notifyPR(true) } }
+    failure { script { github.notifyPR(false) } }
+    always  { sh 'make purge' }
+  }
+}

ci/Jenkinsfile.windows

@@ -1,128 +0,0 @@
-library 'status-react-jenkins@v1.1.7'
-
-pipeline {
-  agent { label 'linux' }
-
-  parameters {
-    string(
-      name: 'BUILD_TYPE',
-      description: 'Specify build type. Values: pr / nightly / release',
-      defaultValue: 'pr',
-    )
-  }
-
-  options {
-    timestamps()
-    /* Prevent Jenkins jobs from running forever */
-    timeout(time: 45, unit: 'MINUTES')
-    /* Limit builds retained */
-    buildDiscarder(logRotator(
-      numToKeepStr: '10',
-      daysToKeepStr: '20',
-      artifactNumToKeepStr: '10',
-    ))
-    /* Allows combined build to copy */
-    copyArtifactPermission('/status-react/*')
-  }
-
-  /**
-   * WARNING: Jenkins ignores PATH changes in Docker
-   * https://issues.jenkins-ci.org/browse/JENKINS-49076
-   **/
-  environment {
-    LANG     = "en_US.UTF-8"
-    LC_ALL   = "en_US.UTF-8"
-    LANGUAGE = "en_US.UTF-8"
-    TARGET   = 'windows'
-    NIX_CONF_DIR = "${env.WORKSPACE}/nix"
-    VERBOSE_LEVEL = '3'
-    /* Conan settings */
-    CONAN_PRINT_RUN_COMMANDS = '1'
-    CONAN_SYSREQUIRES_MODE = 'disabled'
-    CONAN_SYSREQUIRES_SUDO = '0'
-    /* We use EXECUTOR_NUMBER to avoid multiple instances clashing */
-    YARN_CACHE_FOLDER = "/var/tmp/yarn-${EXECUTOR_NUMBER}"
-  }
-
-  stages {
-    stage('Prep') {
-      steps {
-        script {
-          btype = utils.getBuildType()
-          print "Running ${btype} build!"
-          jenkins.abortPreviousRunningBuilds()
-          /* Cleanup and Prep */
-          commonPrep(btype)
-        }
-      }
-    }
-    stage('Parallel Assemble') {
-      parallel {
-        stage('Checks') { stages {
-          stage('Lint') {
-            steps {
-              script {
-                /* We want the build result to be uploaded */
-                catchError(
-                  message: 'Linting check failed!',
-                  buildResult: 'FAILURE',
-                  stageResult: 'FAILURE'
-                ) {
-                  sh 'make lint'
-                }
-              }
-            }
-          }
-          stage('Tests') {
-            steps {
-              script {
-                sh 'make test'
-              }
-            }
-          }
-        } }
-        stage('Build') { stages {
-          stage('JSBundle') {
-            steps {
-              script { desktop.buildJSBundle() }
-            }
-          }
-          stage('Compile') {
-            steps {
-              script { desktop.compile() }
-            }
-          }
-          stage('Bundle') {
-            steps {
-              script { app = desktop.bundleWindows(btype) }
-            }
-          }
-        } }
-      }
-    }
-    stage('Parallel Upload') {
-      parallel {
-        stage('Archive') {
-          steps {
-            archiveArtifacts app
-          }
-        }
-        stage('Upload') {
-          steps {
-            script { env.PKG_URL = s3.uploadArtifact(app) }
-          }
-        }
-      }
-    }
-    stage('Cleanup') {
-      steps {
-        sh 'make watchman-clean'
-        sh 'make clean'
-      }
-    }
-  }
-  post {
-    success { script { github.notifyPR(true) } }
-    failure { script { github.notifyPR(false) } }
-  }
-}

ci/README.md

@@ -6,11 +6,11 @@ This folder contains files defininf [Jenkins pipelines](https://jenkins.io/doc/b
 
 All `Jenkinsfile`s contain the following line:
 ```groovy
-library 'status-react-jenkins@master'
+library 'status-jenkins-lib@master'
 ```
 
 Which loads the used methods - like `nix.shell()` - from a separate private repo:
 
-https://github.com/status-im/status-react-jenkins
+https://github.com/status-im/status-jenkins-lib
 
 This is done to improve security of our CI setup.

ci/tests/Jenkinsfile.e2e-nightly

@@ -1,16 +1,18 @@
+library 'status-jenkins-lib@v1.6.9'
+
 pipeline {
 
   agent { label 'linux' }
 
   parameters {
     string(
-      name: 'NETWORK',
-      description: 'Name of test network to use.',
-      defaultValue: 'ropsten',
+      name: 'APK_URL',
+      description: 'URL of APK uploaded to SauceLabs.',
     )
     string(
-      name: 'APK_NAME',
-      description: 'Filename of APK uploaded to SauceLabs.',
+      name: 'KEYWORD_EXPRESSION',
+      description: 'This will run tests which contain names that match the given string expression  (Optional)',
+      defaultValue: '',
     )
   }
 
@@ -18,8 +20,20 @@ pipeline {
     disableConcurrentBuilds()
   }
 
-
   stages {
+    stage('Fetch') {
+      when { expression { !params.APK_URL } }
+      steps { script {
+        copyArtifacts(
+          projectName: "status-mobile/nightly",
+          filter: '*-x86.apk',
+          /* WARNING: This copies the latest available artifact. */
+          selector: lastWithArtifacts(),
+        )
+        apk_path = "${env.WORKSPACE}/${utils.findFile('*-x86.apk')}"
+      } }
+    }
+
     stage('Setup') {
       steps { script {
         dir('test/appium') {
@@ -27,6 +41,7 @@ pipeline {
         }
       } }
     }
+
     stage('Test') {
       steps {
         withCredentials([
@@ -44,15 +59,27 @@ pipeline {
             credentialsId: 'etherscan-api-key',
             variable: 'ETHERSCAN_API_KEY'
           ),
+          string(
+            credentialsId: 'infura-e2e-token',
+            variable: 'WEB3_INFURA_PROJECT_ID'
+          ),
+          file(
+            credentialsId: "mobile-tests-eth-accounts",
+            variable: 'TEST_ETH_ACCOUNTS_FILE'
+          ),
         ]) {
           dir('test/appium/tests') {
+            /* Provide Eth test accounts secrets. */
+            sh 'cp -f $TEST_ETH_ACCOUNTS_FILE users.py'
             sh """
-              python3 -m pytest -m testrail_id \
-                -m "not upgrade" \
-                -n24 --rerun_count=2 \
+              python3 -m pytest \
+                --numprocesses 4 \
+                --rerun_count=2 \
                 --testrail_report=True \
-                --network=${params.NETWORK} \
-                --apk=${params.APK_NAME}
+                -m testrail_id \
+                -m \"new_ui_critical or new_ui_medium\" \
+                -k \"${params.KEYWORD_EXPRESSION}\" \
+                --apk=${params.APK_URL ?: apk_path}
             """
           }
         }
@@ -76,5 +103,8 @@ pipeline {
         )
       }
     }
+    cleanup {
+      sh 'make purge'
+    }
   }
 }

ci/tests/Jenkinsfile.e2e-prs

@@ -1,3 +1,5 @@
+library 'status-jenkins-lib@v1.6.9'
+
 pipeline {
 
   agent { label 'linux' }
@@ -8,29 +10,37 @@ pipeline {
       description: 'Name of the branch to checkout and build.',
       defaultValue: 'develop',
     )
-    string(
-      name: 'NETWORK',
-      description: 'Name of test network to use.',
-      defaultValue: 'ropsten',
-    )
-    string(
-      name: 'TEST_MARKERS',
-      description: 'Marker expression for matching tests to run.',
-      defaultValue: 'critical or high',
-    )
-    string(
-      name: 'APK_NAME',
-      description: 'Filename of APK uploaded to SauceLabs, path, or URL.',
-    )
     string(
       name: 'PR_ID',
       description: 'ID of the Pull Request triggering this build.',
     )
     string(
-      name: 'TR_CASE_IDS',
-      description: 'IDs of the TestRail case, separated by a comma. (Optional)',
+      name: 'APK_URL',
+      description: 'Optional, set if job require APK to be downloaded from URL.',
+    )
+    string(
+      name: 'KEYWORD_EXPRESSION',
+      description: 'This will run tests which contain names that match the given string expression  (Optional)',
       defaultValue: '',
     )
+    string(
+      name: 'TR_CASE_IDS',
+      description: 'IDs of the TestRail case, separated by a comma (Optional)',
+      defaultValue: '',
+    )
+    /* FIXME: Remove this no longer relevant argument */
+    string(
+      name: 'APK_NAME',
+      description: 'OBSOLETE ARGUMENT TO BE REMOVED',
+      defaultValue: 'DUMMY',
+    )
+    /* Commented to use TEST_MARKERS values from job params
+    string(
+      name: 'TEST_MARKERS',
+      description: 'Marker expression for matching tests to run.',
+      defaultValue: 'new_ui_critical',
+    )
+    */
   }
 
   options {
@@ -38,12 +48,27 @@ pipeline {
   }
 
   stages {
-    stage('Checks') {
+    stage('Prep') {
       steps { script {
-        if (params.APK_NAME == null) { error("APK_NAME parameter not set!") }
-        if (params.PR_ID == null) { error("PR_ID parameter not set!") }
+        currentBuild.displayName = "PR-${params.PR_ID}"
+        if (params.PR_ID == null) {
+          error("PR_ID parameter not set!")
+        }
       } }
     }
+
+    stage('Fetch') {
+      when { expression { !params.APK_URL } }
+      steps { script {
+        copyArtifacts(
+          projectName: "status-mobile/prs/android-e2e/PR-${params.PR_ID}",
+          /* WARNING: This copies the latest available artifact. */
+          selector: lastWithArtifacts(),
+        )
+        apk_path = "${env.WORKSPACE}/${utils.findFile('result/*.apk')}"
+      } }
+    }
+
     stage('Setup') {
       steps { script {
         dir('test/appium') {
@@ -51,18 +76,20 @@ pipeline {
         }
       } }
     }
+
     stage('Test') {
       steps { script {
-        currentBuild.displayName = "PR-${params.PR_ID}"
         /* for managing optional arguments */
         def extraPytestOpts = ''
         if (params.TR_CASE_IDS != '') {
           extraPytestOpts = "--run_testrail_ids='${params.TR_CASE_IDS}'"
+        } else {
+          extraPytestOpts = "-m \"${params.TEST_MARKERS}\""
         }
 
         withCredentials([
           usernamePassword(
-            credentialsId: 'status-im-auto-token',
+            credentialsId: 'status-im-auto',
             usernameVariable: 'GIT_HUB_USER', /* ignored */
             passwordVariable: 'GIT_HUB_TOKEN'
           ),
@@ -80,16 +107,26 @@ pipeline {
             credentialsId: 'etherscan-api-key',
             variable: 'ETHERSCAN_API_KEY'
           ),
+          string(
+            credentialsId: 'infura-e2e-token',
+            variable: 'WEB3_INFURA_PROJECT_ID'
+          ),
+          file(
+            credentialsId: "mobile-tests-eth-accounts",
+            variable: 'TEST_ETH_ACCOUNTS_FILE'
+          ),
         ]) {
           dir('test/appium/tests') {
+            /* Provide Eth test account secrets. */
+            sh 'cp -f $TEST_ETH_ACCOUNTS_FILE users.py'
             sh """
-              python3 -m pytest -n24 \
+              python3 -m pytest \
+                --numprocesses 4 \
                 --rerun_count=2 \
                 --testrail_report=True \
-                -m "${params.TEST_MARKERS}" \
-                --network=${params.NETWORK} \
-                --apk=${params.APK_NAME} \
-                --build=PR-${params.PR_ID} \
+                -k \"${params.KEYWORD_EXPRESSION}\" \
+                --apk=${params.APK_URL ?: apk_path} \
+                --build=PR-${params.PR_ID}-${utils.timestamp()} \
                 --pr_number=${params.PR_ID} \
                 ${extraPytestOpts}
             """
@@ -98,4 +135,9 @@ pipeline {
       } }
     }
   }
+  post {
+    cleanup {
+      sh 'make purge'
+    }
+  }
 }

ci/tests/Jenkinsfile.e2e-upgrade

@@ -1,20 +1,27 @@
+library 'status-jenkins-lib@v1.6.9'
+
 pipeline {
 
   agent { label 'linux' }
 
   parameters {
     string(
-      name: 'NETWORK',
-      description: 'Name of test network to use',
-      defaultValue: 'ropsten',
-    )
-    string(
-      name: 'APK_NAME',
-      description: 'Filename of APK uploaded to SauceLabs (base for upgrade, usually release build)',
+      name: 'APK_URL',
+      description: 'URL of APK to be tested(base for upgrade, usually release build)',
     )
      string(
-      name: 'APK_NAME_UPGRADE',
-      description: 'Filename of APK of upgraded application (installed on top of base)',
+      name: 'APK_URL_UPGRADE',
+      description: 'URL of APK of upgraded application (installed on top of base)',
+    )
+     string(
+      name: 'KEYWORD_EXPRESSION',
+      description: 'This will run tests which contain names that match the given string expression  (Optional)',
+      defaultValue: '',
+    )
+     string(
+      name: 'TR_CASE_IDS',
+      description: 'IDs of the TestRail case, separated by a comma (Optional)',
+      defaultValue: '',
     )
   }
 
@@ -24,6 +31,17 @@ pipeline {
 
 
   stages {
+    stage('Prep') {
+      steps { script {
+        if (params.APK_URL == null) {
+          error("APK_URL parameter not set!")
+        }
+        if (params.APK_URL_UPGRADE == null) {
+          error("APK_URL_UPGRADE parameter not set!")
+        }
+      } }
+    }
+
     stage('Setup') {
       steps { script {
         dir('test/appium') {
@@ -31,8 +49,14 @@ pipeline {
         }
       } }
     }
+
     stage('Test') {
-      steps {
+      steps { script {
+       /* for managing optional arguments */
+        def extraPytestOpts = ''
+        if (params.TR_CASE_IDS != '') {
+          extraPytestOpts = "--run_testrail_ids='${params.TR_CASE_IDS}'"
+        }
         withCredentials([
           usernamePassword(
             credentialsId:  'test-rail-api',
@@ -48,20 +72,33 @@ pipeline {
             credentialsId: 'etherscan-api-key',
             variable: 'ETHERSCAN_API_KEY'
           ),
+          string(
+            credentialsId: 'infura-e2e-token',
+            variable: 'WEB3_INFURA_PROJECT_ID'
+          ),
+          file(
+            credentialsId: "mobile-tests-eth-accounts",
+            variable: 'TEST_ETH_ACCOUNTS_FILE'
+          ),
         ]) {
           dir('test/appium/tests') {
+            /* Provide Eth test accounts secrets. */
+            sh 'cp -f $TEST_ETH_ACCOUNTS_FILE users.py'
             sh """
-              python3 -m pytest -m upgrade \
-                -n24 --rerun_count=2 \
+              python3 -m pytest \
+                -m "upgrade" \
+                -k \"${params.KEYWORD_EXPRESSION}\" \
+                --numprocesses 4 \
+                --rerun_count=2 \
                 --testrail_report=True \
-                --network=${params.NETWORK} \
-                --apk=${params.APK_NAME} \
-                --apk_upgrade=${params.APK_NAME_UPGRADE}
+                --apk=${params.APK_URL} \
+                --apk_upgrade=${params.APK_URL_UPGRADE} \
+                 ${extraPytestOpts}
             """
           }
         }
       }
-    }
+    } }
   }
 
   post {
@@ -80,5 +117,8 @@ pipeline {
         )
       }
     }
+    cleanup {
+      sh 'make purge'
+    }
   }
 }

ci/tools/Jenkinsfile.fastlane-clean

@@ -1,4 +1,4 @@
-library 'status-react-jenkins@v1.1.7'
+library 'status-jenkins-lib@v1.6.9'
 
 pipeline {
   agent { label 'macos' }

ci/tools/Jenkinsfile.playstore-meta

@@ -1,4 +1,4 @@
-library 'status-react-jenkins@v1.1.7'
+library 'status-jenkins-lib@v1.6.9'
 
 pipeline {
   agent { label 'linux' }
@@ -38,7 +38,7 @@ pipeline {
       steps { script {
         withCredentials([
           string(
-            credentialsId: 'SUPPLY_JSON_KEY_DATA',
+            credentialsId: 'google-play-api-key-json',
             variable: 'GOOGLE_PLAY_JSON_KEY'
           ),
         ]) {

ci/tools/Jenkinsfile.pod-repo-update

@@ -0,0 +1,43 @@
+/**
+ * This job runs daily and executes `pod repo update` on MacOS
+ * This is done to avoid issues with out of date repo causing errors like:
+ *
+ * Failed with exit code 1 (in target 'StatusImPR' from project 'StatusIm')
+ **/
+
+pipeline {
+  agent {
+    label params.HOST_LABEL
+  }
+
+  triggers {
+    /* Run daily at 2am */
+    cron('H 2 * * *')
+  }
+  options {
+    timestamps()
+    /* Prevent Jenkins jobs from running forever */
+    timeout(time: 5, unit: 'MINUTES')
+    /* Limit builds retained */
+    buildDiscarder(logRotator(
+      numToKeepStr: '20',
+    ))
+  }
+
+  parameters {
+    string(
+      name: 'HOST_LABEL',
+      description: 'Label of host to run on',
+      /* Using startTimeInMillis to randomize which host gets the update. */
+      defaultValue: "maci7-0${(currentBuild.startTimeInMillis % 3) + 1}",
+    )
+  }
+
+  stages {
+    stage('Update') {
+      steps {
+        sh 'pod repo update'
+      }
+    }
+  }
+}

ci/tools/Jenkinsfile.xcode-clean

@@ -0,0 +1,47 @@
+library 'status-jenkins-lib@v1.6.9'
+
+pipeline {
+  agent {
+    label 'linux'
+  }
+
+  triggers {
+    cron('H 5 * * *')
+  }
+
+  options {
+    timestamps()
+    /* Prevent Jenkins jobs from running forever */
+    timeout(time: 15, unit: 'MINUTES')
+    /* Disable concurrent jobs */
+    disableConcurrentBuilds()
+    /* Don't keep more than 50 builds */
+    buildDiscarder(logRotator(numToKeepStr: '10'))
+  }
+
+  stages {
+    stage('Get Nodes') {
+      steps { script {
+        stagePerNode = nodesByLabel('macos').collectEntries {
+          ["${it}" : generateNodeCleanupStage(it)]
+        }
+      } }
+    }
+
+    stage('Clean Xcode') {
+      steps { script {
+        parallel stagePerNode
+      } }
+    }
+  }
+}
+
+def generateNodeCleanupStage(nodeLabel) {
+  return { stage(nodeLabel) {
+    node(nodeLabel) {
+      dir('/Users/jenkins/Library/Developer/Xcode') {
+        sh 'rm -fr Archives DerivedData'
+      }
+    }
+  } }
+}

deployment/linux/usr/share/applications/Status.desktop

@@ -1,7 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Status
-Comment=Status Desktop
-Exec=Status
-Icon=Status
-Categories=Network;

deployment/macos/Info.plist

@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDisplayName</key>
-	<string>Status</string>
-	<key>CFBundleExecutable</key>
-	<string>Status</string>
-	<key>CFBundleIconFile</key>
-	<string>status-icon</string>
-	<key>CFBundleIdentifier</key>
-	<string>im.status.statusim</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Status</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>0.1</string>
-	<key>CFBundleVersion</key>
-	<string>0.1</string>
-
-	<key>LSMinimumSystemVersion</key>
-	<string>10.9.0</string>
-	<key>NSHighResolutionCapable</key>
-	<string>True</string>
-	<key>NSPrincipalClass</key>
-	<string>NSApplication</string>
-
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>status-im</string>
-			</array>
-			<key>CFBundleURLName</key>
-			<string>im.status.ethereum.applink-desktop</string>
-		</dict>
-	</array>
-</dict>
-</plist>

deployment/macos/create-icon.sh

@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-function make_icns {
-  local file="../status-icon.png"
-  local iconset="$(mktemp -d)"
-  local output_icon="status-icon.icns"
-
-  for size in {16,32,64,128,256,512}; do
-    sips --resampleHeightWidth "${size}" "${size}" "${file}" --out "${iconset}/icon_${size}x${size}.png" &> /dev/null
-    sips --resampleHeightWidth "$((size * 2))" "$((size * 2))" "${file}" --out "${iconset}/icon_${size}x${size}@2x.png" &> /dev/null
-  done
-
-  mv "${iconset}" "${iconset}.iconset"
-  iconutil --convert icns "${iconset}.iconset" --output "${output_icon}"
-
-  echo "${output_icon}" # so its path is returned when the function ends
-}
-
-make_icns

deployment/macos/qt-reportApp.conf

@@ -1,4 +0,0 @@
-[Paths]
-Plugins = ../PlugIns
-Imports = ../Resources/qml
-Qml2Imports = ../Resources/qml

deployment/macos/status-dmg.json

@@ -1,18 +0,0 @@
-{
-  "title": "Status",
-  "background": "dmg-background.png",
-  "contents": [
-    {
-      "x": 385,
-      "y": 235,
-      "type": "link",
-      "path": "/Applications"
-    },
-    {
-      "x": 170,
-      "y": 236,
-      "type": "file",
-      "path": "../../StatusImPackage/Status.app"
-    }
-  ]
-}

deployment/status-icon.svg

@@ -1,24 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="68" height="68" viewBox="0 0 68 68">
-    <defs>
-        <ellipse id="b" cx="31.969" cy="31.938" rx="31.969" ry="31.938"/>
-        <filter id="a" width="114.1%" height="114.1%" x="-7%" y="-3.9%" filterUnits="objectBoundingBox">
-            <feOffset dy="1" in="SourceAlpha" result="shadowOffsetOuter1"/>
-            <feGaussianBlur in="shadowOffsetOuter1" result="shadowBlurOuter1" stdDeviation=".5"/>
-            <feColorMatrix in="shadowBlurOuter1" result="shadowMatrixOuter1" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.22 0"/>
-            <feOffset dy="1" in="SourceAlpha" result="shadowOffsetOuter2"/>
-            <feGaussianBlur in="shadowOffsetOuter2" result="shadowBlurOuter2" stdDeviation="1"/>
-            <feColorMatrix in="shadowBlurOuter2" result="shadowMatrixOuter2" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.25 0"/>
-            <feMerge>
-                <feMergeNode in="shadowMatrixOuter1"/>
-                <feMergeNode in="shadowMatrixOuter2"/>
-            </feMerge>
-        </filter>
-    </defs>
-    <g fill="none" fill-rule="nonzero">
-        <g transform="translate(2 1)">
-            <use fill="#000" filter="url(#a)" xlink:href="#b"/>
-            <use fill="#FFF" xlink:href="#b"/>
-        </g>
-        <path fill="#4360DF" d="M34 1.062c-17.673 0-32 14.313-32 31.97C2 50.686 16.327 65 34 65c17.673 0 32-14.313 32-31.969 0-8.478-3.371-16.61-9.373-22.605A32.016 32.016 0 0 0 34 1.062zm-4.902 46.17c-4.013.225-8.023-2.192-8.243-6.118-.213-3.859 2.799-6.44 7.779-6.72 3.674-.207 5.97.628 9.65.421.911-.05 1.817-.18 2.706-.386-.543 6.633-5.352 12.435-11.892 12.803zm10.298-14.497c-3.834.222-6.238-.671-10.076-.45-.951.053-1.896.191-2.823.413.56-7.084 5.587-13.288 12.414-13.68 4.189-.243 8.376 2.342 8.604 6.536.224 4.124-2.922 6.883-8.119 7.18z"/>
-    </g>
-</svg>

deployment/windows/Status.rc.in

@@ -1,71 +0,0 @@
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE resource.
-//
-#ifndef APSTUDIO_INVOKED
-#include "targetver.h"
-#endif
-#define APSTUDIO_HIDDEN_SYMBOLS
-#include "windows.h"
-#undef APSTUDIO_HIDDEN_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
-LANGUAGE 9, 1
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-
-IDI_STATUS      ICON         "${ICO_RESOURCE_PATH}"
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-1 TEXTINCLUDE
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE
-BEGIN
-    "#ifndef APSTUDIO_INVOKED\r\n"
-    "#include ""targetver.h""\r\n"
-    "#endif\r\n"
-    "#define APSTUDIO_HIDDEN_SYMBOLS\r\n"
-    "#include ""windows.h""\r\n"
-    "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-#endif
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE resource.
-//
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED

deployment/windows/nsis/include/SnoreNotify.nsh

@@ -1,23 +0,0 @@
-!include LogicLib.nsh
-!include WordFunc.nsh
-
-Function SnoreWinVer
-  ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
-  ${VersionCompare} "6.2" $R0 $R0
-  ${If} $R0 == 1
-    Push "NotWin8"
-  ${Else}
-    Push "AtLeastWin8"
-  ${EndIf}
-FunctionEnd
-
-!macro SnoreShortcut path exe appID
-  Call SnoreWinVer
-  Pop $0
-  ${If} $0 == "AtLeastWin8"
-    nsExec::ExecToLog '"${SnoreToastExe}" -install "${path}" "${exe}" "${appID}"'
-  ${Else}
-    DetailPrint "Creating shortcut to ${exe}"
-    CreateShortCut "${path}" "${exe}"
-  ${EndIf}
-!macroend

deployment/windows/nsis/include/UAC.nsh

@@ -1,299 +0,0 @@
-/*** UAC Plug-in ***
-
-Interactive User (MediumIL)        Admin user (HighIL)
-***[Setup.exe]*************      ***[Setup.exe]**************
-*                         *      *                          *
-* +++[.OnInit]+++++++++++ *      * +++[.OnInit]++++++++++++ *
-* + UAC_RunElevated >---+-+----> * +                      + *
-* + NSIS.Quit           + *      * +                      + *
-* +++++++++++++++++++++++ *      * ++++++++++++++++++++++++ *
-*                         *      *                          *
-*                         *      *                          *
-* +++[Section]+++++++++++ *      * +++[Section]++++++++++++ *
-* +                     + *   /--+-+-<UAC_AsUser_ExecShell+ *
-* +++++++++++++++++++++++ *   |  * ++++++++++++++++++++++++ *
-*                         *   |  *                          *
-*  Win32.ShellExecute <---+--/   *                          *
-*                         *      *                          *
-***************************      ****************************
-
-*/
-
-!ifndef UAC_HDR__INC
-!verbose push
-!verbose 3
-!ifndef UAC_VERBOSE  
-	!define UAC_VERBOSE 3
-!endif
-!verbose ${UAC_VERBOSE}
-
-!define UAC_HDR__INC 0x00020400 ;MMmmbbrr
-
-!include LogicLib.nsh
-
-
-
-/* UAC_RunElevated
-**
-** Starts the elevation operation.
-**
-** Return values:
-**
-** $0: Win32 error code (0 on success, 1223 if user aborted elevation dialog, anything else should be treated as a fatal error)
-** $1: If $0==0:
-**     0 UAC is not supported by the OS
-**     1 Started a elevated child process, the current process should act like a wrapper (Call Quit without any further processing)
-**     2 The process is already running @ HighIL (Member of admin group)
-**     3 You should call RunElevated again (This can happen if a user without admin priv. is used in the runas dialog)
-** $2: If $0==0 && $1==1: ExitCode of the elevated fork process (The NSIS errlvl is also set)
-** $3: If $0==0: 1 if the user is a member of the admin group or 0 otherwise
-**/
-!macro UAC_RunElevated
-UAC::_ 0
-!macroend
-!macro UAC_PageElevation_RunElevated
-UAC::_ 0
-!macroend
-/*!macro UAC_OnInitElevation_RunElevated
-UAC::_ 0
-!macroend
-!macro UAC_OnInitElevation_OnGuiInit
-!macroend*/
-
-
-
-/* UAC_GetIntegrityLevel <NSISVar:Output | "s">
-**
-** Get integrity level of current process
-**
-**/
-!macro UAC_GetIntegrityLevel outvar
-UAC::_ 6
-!if "${outvar}" != "s"
-	Pop ${outvar}
-!endif
-!macroend
-
-
-
-/* UAC_IsAdmin
-**
-** Is the current process running with administrator privileges? Result in $0
-**
-** ${If} ${UAC_IsAdmin} ...
-**
-**/
-!macro UAC_IsAdmin
-UAC::_ 2
-!macroend
-!define UAC_IsAdmin `"" UAC_IsAdmin ""`
-!macro _UAC_IsAdmin _a _b _t _f
-!insertmacro _UAC_MakeLL_Cmp _!= 0 2s
-!macroend
-
-
-
-/* UAC_IsInnerInstance
-**
-** Does the current process have a NSIS/UAC parent process that is part of the elevation operation?
-**
-** ${If} ${UAC_IsInnerInstance} ...
-**
-**/
-!macro UAC_IsInnerInstance
-UAC::_ 3
-!macroend
-!define UAC_IsInnerInstance `"" UAC_IsInnerInstance ""`
-!macro _UAC_IsInnerInstance _a _b _t _f
-!insertmacro _UAC_MakeLL_Cmp _!= 0 3s
-!macroend
-
-
-
-/* UAC_PageElevation_OnInit, UAC_PageElevation_OnGuiInit,
-**
-** Helper macros for elevation on a custom elevation page, see the DualMode example for more information.
-**
-**/
-!macro UAC_Notify_OnGuiInit
-UAC::_ 4
-!macroend
-!macro UAC_PageElevation_OnGuiInit
-!insertmacro UAC_Notify_OnGuiInit
-!macroend
-!macro UAC_PageElevation_OnInit
-UAC::_ 5
-${IfThen} ${Errors} ${|} Quit ${|}
-!macroend
-
-
-
-/* UAC_AsUser_Call <Function|Label> <NSISAddressName> <UAC_* flags>
-**
-** Calls a function or label in the user process instance.
-** All the UAC_AsUser_* macros use this helper macro.
-**
-**/
-!define UAC_SYNCREGISTERS 0x1
-;define UAC_SYNCSTACK     0x2
-!define UAC_SYNCOUTDIR    0x4
-!define UAC_SYNCINSTDIR   0x8
-;define UAC_CLEARERRFLAG  0x10
-!macro UAC_AsUser_Call type name flags
-push $0
-Get${type}Address $0 ${name}
-!verbose push
-!verbose ${UAC_VERBOSE}
-!insertmacro _UAC_ParseDefineFlagsToInt _UAC_AsUser_Call__flags ${flags}
-!verbose pop
-StrCpy $0 "1$0:${_UAC_AsUser_Call__flags}"
-!undef _UAC_AsUser_Call__flags
-Exch $0
-UAC::_
-!macroend
-
-
-
-/*
-** UAC_AsUser_GetSection <Flags|InstTypes|Size|Text> <SectionIndex> <NSISVar:Output>
-*/
-!macro UAC_AsUser_GetSection secprop secidx outvar
-!insertmacro _UAC_AsUser_GenOp ${outvar} SectionGet${secprop} ${secidx} ""
-!macroend
-
-
-
-/*
-** UAC_AsUser_GetGlobalVar <NSISVar:SourceAndOutput>
-** UAC_AsUser_GetGlobal <NSISVar:Output> <NSISVar:Source>
-*/
-!macro UAC_AsUser_GetGlobalVar var
-!insertmacro _UAC_AsUser_GenOp ${var} StrCpy "" ${var}
-!macroend
-!macro UAC_AsUser_GetGlobal outvar srcvar
-!insertmacro _UAC_AsUser_GenOp ${outvar} StrCpy "" ${srcvar}
-!macroend
-
-
-
-/*
-** UAC_AsUser_ExecShell <Verb> <ApplicationOrFile> <Parameters> <Working Directory> <SW_*>
-**
-** Call ExecShell in the user process instance.
-**
-*/
-!macro UAC_AsUser_ExecShell verb command params workdir show
-!insertmacro _UAC_IncL
-goto _UAC_L_E_${__UAC_L}
-_UAC_L_F_${__UAC_L}:
-ExecShell "${verb}" "${command}" '${params}' ${show}
-return
-_UAC_L_E_${__UAC_L}:
-!if "${workdir}" != ""
-	push $outdir
-	SetOutPath "${workdir}"
-!endif
-!insertmacro UAC_AsUser_Call Label _UAC_L_F_${__UAC_L} ${UAC_SYNCREGISTERS}|${UAC_SYNCOUTDIR}|${UAC_SYNCINSTDIR} #|${UAC_CLEARERRFLAG}
-!if "${workdir}" != ""
-	pop $outdir 
-	SetOutPath $outdir
-!endif
-!macroend
-
-
-
-!macro _UAC_MakeLL_Cmp cmpop cmp pluginparams
-!insertmacro _LOGICLIB_TEMP
-UAC::_ ${pluginparams}
-pop $_LOGICLIB_TEMP
-!insertmacro ${cmpop} $_LOGICLIB_TEMP ${cmp} `${_t}` `${_f}`
-!macroend
-!macro _UAC_definemath def val1 op val2
-!define /math _UAC_definemath "${val1}" ${op} ${val2}
-!ifdef ${def}
-	!undef ${def}
-!endif
-!define ${def} "${_UAC_definemath}"
-!undef _UAC_definemath
-!macroend
-!macro _UAC_ParseDefineFlags_orin parse outflags
-!searchparse /noerrors ${${parse}} "" _UAC_ParseDefineFlags_orin_f1 "|" _UAC_ParseDefineFlags_orin_f2
-!define _UAC_ParseDefineFlags_orin_this ${_UAC_ParseDefineFlags_orin_f1}
-!undef ${parse}
-!define ${parse} ${_UAC_ParseDefineFlags_orin_f2}
-!define _UAC_ParseDefineFlags_orin_saveout ${${outflags}}
-!undef ${outflags}
-!define /math ${outflags} "${_UAC_ParseDefineFlags_orin_saveout}" | "${_UAC_ParseDefineFlags_orin_this}"
-!undef _UAC_ParseDefineFlags_orin_saveout
-!undef _UAC_ParseDefineFlags_orin_this
-!ifdef _UAC_ParseDefineFlags_orin_f1
-	!undef _UAC_ParseDefineFlags_orin_f1
-!endif
-!ifdef _UAC_ParseDefineFlags_orin_f2
-	!undef _UAC_ParseDefineFlags_orin_f2
-!endif
-!macroend
-!macro _UAC_ParseDefineFlags_Begin _outdef _in
-!define _UAC_PDF${_outdef}_parse "${_in}"
-!define _UAC_PDF${_outdef}_flags ""
-!define _UAC_PDF${_outdef}_r 0
-!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x1
-!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x2
-!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x4
-!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x8
-!insertmacro _UAC_ParseDefineFlags_orin _UAC_PDF${_outdef}_parse _UAC_PDF${_outdef}_flags	;0x10
-!macroend
-!macro _UAC_ParseDefineFlags_End _outdef
-!define ${_outdef} ${_UAC_PDF${_outdef}_r}
-!undef _UAC_PDF${_outdef}_r
-!undef _UAC_PDF${_outdef}_flags
-!undef _UAC_PDF${_outdef}_parse
-!macroend
-!macro _UAC_ParseDefineFlags_IncludeFlag _outdef flag
-!if ${_UAC_PDF${_outdef}_flags} & ${flag}
-	!insertmacro _UAC_definemath _UAC_PDF${_outdef}_r ${_UAC_PDF${_outdef}_r} | ${flag}
-!endif
-!macroend
-!macro _UAC_ParseDefineFlagsToInt _outdef _in
-!insertmacro _UAC_ParseDefineFlags_Begin _UAC_ParseDefineFlagsToInt_tmp "${_in}"
-!define ${_outdef} ${_UAC_PDF_UAC_ParseDefineFlagsToInt_tmp_flags}
-!insertmacro _UAC_ParseDefineFlags_End _UAC_ParseDefineFlagsToInt_tmp
-!undef _UAC_ParseDefineFlagsToInt_tmp
-!macroend
-!macro _UAC_IncL
-!insertmacro _UAC_definemath __UAC_L "${__UAC_L}" + 1
-!macroend
-!macro _UAC_AsUser_GenOp outvar op opparam1 opparam2
-!define _UAC_AUGOGR_ID _UAC_AUGOGR_OP${outvar}${op}${opparam1}${opparam2}
-!ifndef ${_UAC_AUGOGR_ID} ;Has this exact action been done before? 
-	!if ${outvar} == $0
-		!define ${_UAC_AUGOGR_ID} $1
-	!else
-		!define ${_UAC_AUGOGR_ID} $0
-	!endif
-	!if "${opparam1}" == ""
-		!define _UAC_AUGOGR_OPP1 ${${_UAC_AUGOGR_ID}}
-		!define _UAC_AUGOGR_OPP2 ${opparam2}
-	!else
-		!define _UAC_AUGOGR_OPP1 ${opparam1}
-		!define _UAC_AUGOGR_OPP2 ${${_UAC_AUGOGR_ID}}
-	!endif	
-	goto ${_UAC_AUGOGR_ID}_C
-	${_UAC_AUGOGR_ID}_F:
-		${op} ${_UAC_AUGOGR_OPP1} ${_UAC_AUGOGR_OPP2}
-		return
-	${_UAC_AUGOGR_ID}_C:
-	!undef _UAC_AUGOGR_OPP1
-	!undef _UAC_AUGOGR_OPP2
-!endif
-push ${${_UAC_AUGOGR_ID}}
-!insertmacro UAC_AsUser_Call Label ${_UAC_AUGOGR_ID}_F ${UAC_SYNCREGISTERS}
-StrCpy ${outvar} ${${_UAC_AUGOGR_ID}}
-pop ${${_UAC_AUGOGR_ID}}
-!undef _UAC_AUGOGR_ID
-!macroend
-
-
-
-!verbose pop
-!endif /* UAC_HDR__INC */

deployment/windows/nsis/include/nsProcess.nsh

@@ -1,28 +0,0 @@
-!define nsProcess::FindProcess `!insertmacro nsProcess::FindProcess`
-
-!macro nsProcess::FindProcess _FILE _ERR
-	nsProcess::_FindProcess /NOUNLOAD `${_FILE}`
-	Pop ${_ERR}
-!macroend
-
-
-!define nsProcess::KillProcess `!insertmacro nsProcess::KillProcess`
-
-!macro nsProcess::KillProcess _FILE _ERR
-	nsProcess::_KillProcess /NOUNLOAD `${_FILE}`
-	Pop ${_ERR}
-!macroend
-
-!define nsProcess::CloseProcess `!insertmacro nsProcess::CloseProcess`
-
-!macro nsProcess::CloseProcess _FILE _ERR
-	nsProcess::_CloseProcess /NOUNLOAD `${_FILE}`
-	Pop ${_ERR}
-!macroend
-
-
-!define nsProcess::Unload `!insertmacro nsProcess::Unload`
-
-!macro nsProcess::Unload
-	nsProcess::_Unload
-!macroend