fix crash on ios

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

.env

@@ -22,3 +22,5 @@ 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

.env.e2e

@@ -5,6 +5,7 @@ ETHEREUM_DEV_CLUSTER=1
 EXTENSIONS=0
 FLEET=eth.prod
 GROUP_CHATS_ENABLED=1
+HARDWALLET_ENABLED=1
 LOG_LEVEL_STATUS_GO=info
 LOG_LEVEL=debug
 MAILSERVER_CONFIRMATIONS_ENABLED=0
@@ -21,3 +22,5 @@ MOBILE_UI_FOR_DESKTOP=1
 BLANK_PREVIEW=0
 TOOLTIP_EVENTS=1
 COMMANDS_ENABLED=1
+KEYCARD_TEST_MENU=1
+QR_READ_TEST_MENU=1

.env.release

@@ -4,7 +4,7 @@ ERC20_CONTRACT_WARNINGS=0
 ETHEREUM_DEV_CLUSTER=0
 EXTENSIONS=0
 FLEET=eth.prod
-GROUP_CHATS_ENABLED=0
+GROUP_CHATS_ENABLED=1
 LOG_LEVEL_STATUS_GO=
 LOG_LEVEL=info
 MAILSERVER_CONFIRMATIONS_ENABLED=1

Makefile

@@ -16,7 +16,7 @@ RESET  := $(shell tput -Txterm sgr0)
 HELP_FUN = \
 		   %help; \
 		   while(<>) { push @{$$help{$$2 // 'options'}}, [$$1, $$3] if /^([a-zA-Z\-]+)\s*:.*\#\#(?:@([a-zA-Z\-]+))?\s(.*)$$/ }; \
-		   print "Usage: make [target]\n\n"; \
+		   print "Usage: make [target]\n\nSee STARTING_GUIDE.md for more info.\n\n"; \
 		   for (sort keys %help) { \
 			   print "${WHITE}$$_:${RESET}\n"; \
 			   for (@{$$help{$$_}}) { \
@@ -48,7 +48,7 @@ export TARGET ?= $(TARGET_OS)
 endif
 
 # Useful for checking if we are on NixOS
-OS_NAME := $(shell awk -F= '/^NAME/{print $2}' /etc/os-release)
+OS_NAME := $(shell [ -f /etc/os-release ] && awk -F= '/^NAME/{print $2}' /etc/os-release)
 
 # Useful for Andoird release builds
 TMP_BUILD_NUMBER := $(shell ./scripts/version/gen_build_no.sh | cut -c1-10)
@@ -230,7 +230,7 @@ jsbundle-desktop: ##@jsbundle Compile JavaScript and Clojure into index.desktop.
 	node prepare-modules.js
 
 #--------------
-# REPL
+# Clojure REPL
 # -------------
 
 _watch-%: ##@watch Start development for device
@@ -239,22 +239,18 @@ _watch-%: ##@watch Start development for device
 	clj -R:dev build.clj watch --platform $(SYSTEM) --$(SYSTEM)-device $(DEVICE)
 
 watch-ios-real: export TARGET := ios
-watch-ios-real: _watch-ios-real ##@watch Start development for iOS real device
-
+watch-ios-real: _watch-ios-real
 watch-ios-simulator: export TARGET := ios
-watch-ios-simulator: _watch-ios-simulator ##@watch Start development for iOS simulator
-
+watch-ios-simulator: _watch-ios-simulator
 watch-android-real: export TARGET := android
-watch-android-real: _watch-android-real ##@watch Start development for Android real device
-
+watch-android-real: _watch-android-real
 watch-android-avd: export TARGET := android
-watch-android-avd: _watch-android-avd ##@watch Start development for Android AVD
-
+watch-android-avd: _watch-android-avd
 watch-android-genymotion: export TARGET ?= android
-watch-android-genymotion: _watch-android-genymotion ##@watch Start development for Android Genymotion
+watch-android-genymotion: _watch-android-genymotion
 
 watch-desktop: export TARGET ?= $(HOST_OS)
-watch-desktop: ##@watch Start development for Desktop
+watch-desktop:
 	clj -R:dev build.clj watch --platform desktop
 
 desktop-server: export TARGET ?= $(HOST_OS)
@@ -262,15 +258,15 @@ desktop-server:
 	node ubuntu-server.js
 
 #--------------
-# Run
-# -------------
+# Run React-Native app
+#--------------
 _run-%:
 	$(eval SYSTEM := $(word 2, $(subst -, , $@)))
 	npx react-native run-$(SYSTEM)
 
 # TODO: Migrate this to a Nix recipe, much the same way as nix/mobile/android/targets/release-android.nix
 run-android: export TARGET := android
-run-android: ##@run Run Android build
+run-android: ##@run Build Android APK and start it on the device
 	npx react-native run-android --appIdSuffix debug
 
 run-desktop: export TARGET ?= $(HOST_OS)
@@ -278,7 +274,7 @@ run-desktop: _run-desktop ##@run Run Desktop build
 
 SIMULATOR=
 run-ios: export TARGET := ios
-run-ios: ##@run Run iOS build
+run-ios: ##@run Build iOS app and start it in a simulator/device
 ifneq ("$(SIMULATOR)", "")
 	npx react-native run-ios --simulator="$(SIMULATOR)"
 else
@@ -377,13 +373,19 @@ _startdev-%:
 
 startdev-android-avd: export TARGET = android
 startdev-android-avd: _startdev-android-avd
+startdev-android-avd:  ##@startdev Compile Clojure for Android AVD
 startdev-android-genymotion: export TARGET = android
 startdev-android-genymotion: _startdev-android-genymotion
+startdev-android-genymotion: ##@startdev Compile Clojure for Genymotion
 startdev-android-real: export TARGET = android
 startdev-android-real: _startdev-android-real
-startdev-desktop: export TARGET ?= $(HOST_OS)
-startdev-desktop: _startdev-desktop
+startdev-android-real: ##@startdev Compile Clojure for Android real device
 startdev-ios-real: export TARGET = ios
 startdev-ios-real: _startdev-ios-real
+startdev-ios-real: ##@startdev Compile Clojure for iOS device
 startdev-ios-simulator: export TARGET = ios
 startdev-ios-simulator: _startdev-ios-simulator
+startdev-ios-simulator: ##@startdev Compile Clojure for iOS simulator
+
+startdev-desktop: export TARGET ?= $(HOST_OS)
+startdev-desktop: _startdev-desktop

STARTING_GUIDE.md

@@ -17,6 +17,17 @@ make release-ios
 ```
 For more `make` targets run `make help`.
 
+# Development
+
+There are three steps necessary to start development, in this case for Android:
+
+1. `make startdev-android-real` - Compiles Clojure into JavaScript for real device
+2. `make react-native-android` - Watches JavaScript code and updates the App
+3. `make run-android` - Builds the Android app and starts it on the device
+
+The first two will continue watching for changes and keep re-building the app.
+The last one will exit once the app is up and ready.
+
 # Manual Steps
 
 There are a few manual steps you might want to do in order to start contributing.

VERSION

@@ -1 +1 @@
-0.14.0
+1.3.1

android/app/build.gradle

@@ -307,29 +307,40 @@ dependencies {
     // NOTE: Uncomment if building RN from a fork
     //compile ("com.facebook.react:react-native:0.55.4") { force = true }  // From node_modules
     implementation project(':react-native-status')
-    implementation project(':react-native-webview-bridge')
     implementation project(':react-native-status-keycard')
     implementation 'com.github.status-im:function:0.0.1'
     implementation 'com.facebook.fresco:fresco:2.0.0'
     implementation 'com.facebook.fresco:animated-gif:2.0.0'
 }
 
-// Run this once to be able to run the application with BUCK
-// puts all compile dependencies into folder libs for BUCK to use
-
-task hemroidBuild(type: Exec) {
+def getLocalNDKDir = { ->
     def rootDir = project.rootDir
     def localProperties = new File(rootDir, "local.properties")
-
-    def ndkDir = System.env.ANDROID_NDK
-    if (localProperties.exists()) {
-        Properties properties = new Properties()
-        localProperties.withInputStream { instr ->
-            properties.load(instr)
-        }
-        ndkDir = properties.getProperty('ndk.dir')
+    if (!localProperties.exists()) {
+        return null
     }
-    executable "$ndkDir/ndk-build"
+    Properties properties = new Properties()
+    localProperties.withInputStream { instr ->
+        properties.load(instr)
+    }
+    return properties.getProperty('ndk.dir')
+}
+
+// Run this once to be able to run the application with BUCK
+// puts all compile dependencies into folder libs for BUCK to use
+task hemroidBuild(type: Exec) {
+    def localNdkDir = getLocalNDKDir()
+    def ndkDir = System.env.ANDROID_NDK
+    if (localNdkDir != null) {
+        ndkDir = localNdkDir 
+    }
+
+    def execPath = "$ndkDir/ndk-build"
+    def exec = new File(execPath)
+    if (!exec.exists()) {
+        throw new GradleException("No ndk-build binary found!")
+    }
+    executable execPath
 }
 
 preBuild.dependsOn hemroidBuild

android/app/src/main/AndroidManifest.xml

@@ -41,7 +41,7 @@
                 android:label="@string/app_name"
                 android:screenOrientation="portrait"
                 android:windowSoftInputMode="adjustResize"
-                android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+                android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"
                 android:resizeableActivity="false"
                 android:launchMode="singleTask">
             <intent-filter>

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

@@ -108,6 +108,17 @@ public class MainActivity extends ReactFragmentActivity
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
+        switch (getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) {
+            case Configuration.UI_MODE_NIGHT_YES:
+                setTheme(R.style.DarkTheme);
+
+                break;
+            case Configuration.UI_MODE_NIGHT_NO:
+                setTheme(R.style.LightTheme);
+                break;
+            default:
+                setTheme(R.style.LightTheme);
+        }
         // Make sure we get an Alert for every uncaught exceptions
         registerUncaughtExceptionHandler(MainActivity.this);
 
@@ -230,10 +241,6 @@ public class MainActivity extends ReactFragmentActivity
         if (mPermissionListener != null && mPermissionListener.onRequestPermissionsResult(requestCode, permissions, grantResults)) {
             mPermissionListener = null;
         }
-        if (grantResults.length == 1 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-            // Permission has been granted. Start camera preview Activity.
-            com.github.alinz.reactnativewebviewbridge.WebViewBridgeManager.grantAccess(requestCode);
-        }
     }
 
     @Override

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

@@ -11,7 +11,6 @@ import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.soloader.SoLoader;
-import com.github.alinz.reactnativewebviewbridge.WebViewBridgePackage;
 
 import java.util.List;
 
@@ -33,7 +32,6 @@ public class MainApplication extends MultiDexApplication implements ReactApplica
             packages.add(statusPackage);
             packages.add(new ReactNativeDialogsPackage());
             packages.add(new RNStatusKeycardPackage());
-            packages.add(new WebViewBridgePackage(BuildConfig.DEBUG_WEBVIEW == "1"));
             return packages;
         }
 

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

@@ -3,7 +3,7 @@
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/background">
+        android:background="?attr/backgroundColor">
 
     <ImageView
             android:layout_width="wrap_content"

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

@@ -1,6 +0,0 @@
-<resources>
-    <color name="primary">#4360df</color>
-    <color name="primary_dark">#FFFFFF</color>
-    <color name="accent">#5c6bc0</color>
-    <color name="background">#FFFFFF</color>
-</resources>

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

@@ -1,13 +1,20 @@
 <resources>
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorPrimary">@color/primary</item>
-        <item name="colorPrimaryDark">@color/primary_dark</item>
-        <item name="colorAccent">@color/accent</item>
-
-        <item name="colorControlNormal">@color/primary</item>
-        <item name="colorControlActivated">@color/primary</item>
-        <item name="android:windowBackground">@color/background</item>
-        <item name="android:textColor">#000000</item>
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
+        <item name="colorPrimary">#4360df</item>
+        <item name="colorPrimaryDark">?attr/backgroundColor</item>
+        <item name="colorControlActivated">#4360df</item>
+        <item name="android:windowBackground">?attr/backgroundColor</item>
+        <item name="android:textColor">?attr/textColor</item>
+        <item name="android:forceDarkAllowed">true</item>
     </style>
 
+    <style name="LightTheme" parent="AppTheme">
+        <item name="textColor">#000000</item>
+        <item name="backgroundColor">#ffffff</item>
+    </style>
+
+    <style name="DarkTheme" parent="AppTheme">
+        <item name="textColor">#ffffff</item>
+        <item name="backgroundColor">#000000</item>
+    </style>
 </resources>

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <attr name="backgroundColor" format="color"/>
+    <attr name="textColor" format="color"/>
+</resources>

android/gradle.properties

@@ -21,6 +21,7 @@
 # $keytool -genkey -v -keystore ./status-keystore.jks -keyalg RSA -keysize 2048 -validity 10000 -alias status
 
 # Version requirements used throughout the Gradle scripts
+kotlinVersion=1.3.11
 minSdkVersion=23
 compileSdkVersion=29
 targetSdkVersion=29

android/settings.gradle

@@ -16,5 +16,3 @@ 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-webview-bridge'
-project(':react-native-webview-bridge').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-webview-bridge/android')

ci/Jenkinsfile.android

@@ -63,7 +63,16 @@ pipeline {
         stage('Checks') { stages {
           stage('Lint') {
             steps {
-              script { nix.shell('lein cljfmt check', attr: 'shells.lein') }
+              script {
+                /* We want the build result to be uploaded */
+                catchError(
+                  message: 'Linting check failed!',
+                  buildResult: 'FAILURE',
+                  stageResult: 'FAILURE'
+                ) {
+                  nix.shell('lein cljfmt check', attr: 'shells.lein')
+                }
+              }
             }
           }
           stage('Tests') {
@@ -100,6 +109,8 @@ pipeline {
               }
               /* build type specific */
               switch (btype) {
+                case 'release':
+                  android.uploadToPlayStore(); break;
                 case 'nightly':
                   env.DIAWI_URL = android.uploadToDiawi(); break;
                 case 'e2e':

ci/Jenkinsfile.combined

@@ -75,7 +75,7 @@ pipeline {
       steps { script {
         switch (btype) {
           case 'nightly': build(job: 'misc/status.im', wait: false); break
-          case 'release': gh.publishReleaseMobile(); break
+          case 'release': github.publishReleaseMobile(); break
         }
       } }
     }

ci/Jenkinsfile.ios

@@ -1,7 +1,7 @@
 library 'status-react-jenkins@master'
 
 pipeline {
-  agent { label 'macos-xcode-11.3.1' }
+  agent { label 'macos-xcode-11.4.1' }
 
   parameters {
     string(
@@ -54,7 +54,16 @@ pipeline {
         stage('Checks') { stages {
           stage('Lint') {
             steps {
-              script { nix.shell('lein cljfmt check', attr: 'shells.lein') }
+              script {
+                /* We want the build result to be uploaded */
+                catchError(
+                  message: 'Linting check failed!',
+                  buildResult: 'FAILURE',
+                  stageResult: 'FAILURE'
+                ) {
+                  nix.shell('lein cljfmt check', attr: 'shells.lein')
+                }
+              }
             }
           }
           stage('Tests') {

ci/Jenkinsfile.linux

@@ -57,7 +57,16 @@ pipeline {
         stage('Checks') { stages {
           stage('Lint') {
             steps {
-              script { nix.shell('lein cljfmt check', attr: 'shells.lein') }
+              script {
+                /* We want the build result to be uploaded */
+                catchError(
+                  message: 'Linting check failed!',
+                  buildResult: 'FAILURE',
+                  stageResult: 'FAILURE'
+                ) {
+                  nix.shell('lein cljfmt check', attr: 'shells.lein')
+                }
+              }
             }
           }
           stage('Tests') {

ci/Jenkinsfile.macos

@@ -1,7 +1,7 @@
 library 'status-react-jenkins@master'
 
 pipeline {
-  agent { label 'macos-xcode-11.3.1' }
+  agent { label 'macos-xcode-11.4.1' }
 
   parameters {
     string(
@@ -55,7 +55,16 @@ pipeline {
         stage('Checks') { stages {
           stage('Lint') {
             steps {
-              script { nix.shell('lein cljfmt check', attr: 'shells.lein') }
+              script {
+                /* We want the build result to be uploaded */
+                catchError(
+                  message: 'Linting check failed!',
+                  buildResult: 'FAILURE',
+                  stageResult: 'FAILURE'
+                ) {
+                  nix.shell('lein cljfmt check', attr: 'shells.lein')
+                }
+              }
             }
           }
           stage('Tests') {

ci/Jenkinsfile.windows

@@ -60,7 +60,16 @@ pipeline {
         stage('Checks') { stages {
           stage('Lint') {
             steps {
-              script { nix.shell('lein cljfmt check', attr: 'shells.lein') }
+              script {
+                /* We want the build result to be uploaded */
+                catchError(
+                  message: 'Linting check failed!',
+                  buildResult: 'FAILURE',
+                  stageResult: 'FAILURE'
+                ) {
+                  nix.shell('lein cljfmt check', attr: 'shells.lein')
+                }
+              }
             }
           }
           stage('Tests') {

clj-rn.conf.edn

@@ -18,7 +18,7 @@
               "react-native-image-resizer"
               "react-native-image-crop-picker"
               "react-native-svg"
-              "react-native-webview-bridge"
+              "react-native-webview"
               "react-native-touch-id"
               "web3-utils"
               "chance"
@@ -43,7 +43,12 @@
               "react-native-mail"
               "react-native-shake"
               "@react-native-community/netinfo"
-              "react-native-safe-area-context"]
+              "react-native-gesture-handler"
+              "react-native-reanimated"
+              "react-native-redash"
+              "react-native-haptic-feedback"
+              "react-native-safe-area-context"
+              "react-native-dark-mode"]
  ;; Desktop modules
  :desktop-modules ["buffer"
                    "bignumber.js"

components/src/status_im/react_native/resources.cljs

@@ -1,34 +1,47 @@
-(ns status-im.react-native.resources)
+(ns status-im.react-native.resources
+  (:require [status-im.ui.components.colors :as colors]))
 
 (def ui
-  {:empty-chats-header  (js/require "./resources/images/ui/empty-chats-header.png")
-   :welcome             (js/require "./resources/images/ui/welcome.jpg")
-   :intro1              (js/require "./resources/images/ui/intro1.jpg")
-   :intro2              (js/require "./resources/images/ui/intro2.jpg")
-   :intro3              (js/require "./resources/images/ui/intro3.jpg")
-   :sample-key          (js/require "./resources/images/ui/sample-key.jpg")
-   :lock                (js/require "./resources/images/ui/lock.png")
-   :tribute-to-talk     (js/require "./resources/images/ui/tribute-to-talk.png")
-   :hardwallet-card     (js/require "./resources/images/ui/hardwallet-card.png")
-   :keycard-lock        (js/require "./resources/images/ui/keycard-lock.png")
-   :keycard             (js/require "./resources/images/ui/keycard.png")
-   :keycard-logo        (js/require "./resources/images/ui/keycard-logo.png")
-   :keycard-logo-blue   (js/require "./resources/images/ui/keycard-logo-blue.png")
-   :keycard-logo-gray   (js/require "./resources/images/ui/keycard-logo-gray.png")
-   :keycard-key         (js/require "./resources/images/ui/keycard-key.png")
-   :keycard-empty       (js/require "./resources/images/ui/keycard-empty.png")
-   :keycard-phone       (js/require "./resources/images/ui/keycard-phone.png")
-   :keycard-connection  (js/require "./resources/images/ui/keycard-connection.png")
-   :keycard-wrong       (js/require "./resources/images/ui/keycard-wrong.png")
-   :not-keycard         (js/require "./resources/images/ui/not-keycard.png")
-   :status-logo         (js/require "./resources/images/ui/status-logo.png")
-   :warning-sign        (js/require "./resources/images/ui/warning-sign.png")
-   :phone-nfc-on        (js/require "./resources/images/ui/phone-nfc-on.png")
-   :phone-nfc-off       (js/require "./resources/images/ui/phone-nfc-off.png")
-   :dapp-store          (js/require "./resources/images/ui/dapp-store.png")
-   :ens-header          (js/require "./resources/images/ui/ens-header.png")
-   :new-chat-header     (js/require "./resources/images/ui/new-chat-header.png")
-   :onboarding-phone    (js/require "./resources/images/ui/onboarding-phone.png")})
+  {:empty-chats-header (js/require "./resources/images/ui/empty-chats-header.png")
+   :welcome            (js/require "./resources/images/ui/welcome.jpg")
+   :welcome-dark       (js/require "./resources/images/ui/welcome-dark.jpg")
+   :chat               (js/require "./resources/images/ui/chat.jpg")
+   :wallet             (js/require "./resources/images/ui/wallet.jpg")
+   :browser            (js/require "./resources/images/ui/browser.jpg")
+   :chat-dark          (js/require "./resources/images/ui/chat-dark.jpg")
+   :wallet-dark        (js/require "./resources/images/ui/wallet-dark.jpg")
+   :browser-dark       (js/require "./resources/images/ui/browser-dark.jpg")
+   :keys               (js/require "./resources/images/ui/keys.jpg")
+   :keys-dark          (js/require "./resources/images/ui/keys-dark.jpg")
+   :lock               (js/require "./resources/images/ui/lock.png")
+   :tribute-to-talk    (js/require "./resources/images/ui/tribute-to-talk.png")
+   :hardwallet-card    (js/require "./resources/images/ui/hardwallet-card.png")
+   :keycard-lock       (js/require "./resources/images/ui/keycard-lock.png")
+   :keycard            (js/require "./resources/images/ui/keycard.png")
+   :keycard-logo       (js/require "./resources/images/ui/keycard-logo.png")
+   :keycard-logo-blue  (js/require "./resources/images/ui/keycard-logo-blue.png")
+   :keycard-logo-gray  (js/require "./resources/images/ui/keycard-logo-gray.png")
+   :keycard-key        (js/require "./resources/images/ui/keycard-key.png")
+   :keycard-empty      (js/require "./resources/images/ui/keycard-empty.png")
+   :keycard-phone      (js/require "./resources/images/ui/keycard-phone.png")
+   :keycard-connection (js/require "./resources/images/ui/keycard-connection.png")
+   :keycard-wrong      (js/require "./resources/images/ui/keycard-wrong.png")
+   :not-keycard        (js/require "./resources/images/ui/not-keycard.png")
+   :status-logo        (js/require "./resources/images/ui/status-logo.png")
+   :warning-sign       (js/require "./resources/images/ui/warning-sign.png")
+   :phone-nfc-on       (js/require "./resources/images/ui/phone-nfc-on.png")
+   :phone-nfc-off      (js/require "./resources/images/ui/phone-nfc-off.png")
+   :dapp-store         (js/require "./resources/images/ui/dapp-store.png")
+   :ens-header         (js/require "./resources/images/ui/ens-header.png")
+   :ens-header-dark    (js/require "./resources/images/ui/ens-header-dark.png")
+   :new-chat-header    (js/require "./resources/images/ui/new-chat-header.png")
+   :onboarding-phone   (js/require "./resources/images/ui/onboarding-phone.png")
+   :theme-dark         (js/require "./resources/images/ui/theme-dark.png")
+   :theme-light        (js/require "./resources/images/ui/theme-light.png")
+   :theme-system       (js/require "./resources/images/ui/theme-system.png")})
+
+(defn get-theme-image [k]
+  (get ui (when (colors/dark?) (keyword (str (name k) "-dark"))) (get ui k)))
 
 (def loaded-images (atom {}))
 

components/src/status_im/ui/components/react.cljs

@@ -70,6 +70,11 @@
 (defn activity-indicator [props]
   [activity-indicator-class props])
 
+(defn small-loading-indicator [color]
+  [activity-indicator {:color   (if color color :colors/gray)
+                       :ios     {:size :small}
+                       :android {:size :16}}])
+
 (def modal (get-class "Modal"))
 
 (def pan-responder (.-PanResponder js-dependencies/react-native))
@@ -171,7 +176,8 @@
   [text {:style  style} (i18n/label key)])
 
 (defn icon
-  ([n] (icon n styles/icon-default))
+  ([n] (icon n {:width  24
+                :height 24}))
   ([n style]
    [image {:source     {:uri (keyword (str "icon_" (name n)))}
            :resizeMode "contain"
@@ -274,3 +280,6 @@
 (def safe-area-consumer (adapt-class (object/get js-dependencies/safe-area-context "SafeAreaConsumer")))
 
 (def safe-area-view (adapt-class (object/get js-dependencies/safe-area-context "SafeAreaView")))
+
+
+(def touchable-without-feedback-gesture (adapt-class (object/get js-dependencies/react-native-gesture-handler "TouchableWithoutFeedback")))

dev/status_im/i18n_resources.cljs

@@ -9,7 +9,7 @@
 
 ;; translations
 (def translations-by-locale
-  (->> (i18n/translations [:en :es_419 :fa :ko :ms :pl :ru :zh :zh_Hans_CN])
+  (->> (i18n/translations [:ar :en :es :es_419 :fil :fr :it :ko :ru :in :id :tr :zh :zh_Hant :zh_TW])
        (map (fn [[k t]]
               (let [k' (-> (name k)
                            (string/replace "_" "-")

externs.js

@@ -218,6 +218,7 @@ var TopLevel = {
   "injectJavaScript" : function () {},
   "installApplet" : function () {},
   "installAppletAndInitCard" : function () {},
+  "installCashApplet" : function () {},
   "Int8Array" : function () {},
   "integer" : function () {},
   "interpolate" : function () {},
@@ -489,8 +490,10 @@ var TopLevel = {
   "showActionSheetWithOptions" : function () {},
   "showPicker" : function () {},
   "sign" : function () {},
+  "signWithPath" : function () {},
   "signGroupMembership" : function () {},
   "signMessage" : function () {},
+  "signPinless" : function () {},
   "signTypedData" : function () {},
   "slice" : function () {},
   "SplashScreen" : function () {},
@@ -563,7 +566,6 @@ var TopLevel = {
   "FlatList" : function () {},
   "warn" : function () {},
   "WebView" : function () {},
-  "WebViewBridgeModule" : function () {},
   "width" : function () {},
   "window" : function () {},
   "writeCopyTo" : function () {},

fiddle/src/status_im/react_native/js_dependencies.cljs

@@ -20,7 +20,6 @@
        :DeviceEventEmitter #js {:addListener (fn [])}
        :Dimensions         #js {:get  (fn [])}})
 (def vector-icons           (fn [] #js {:default #js {}}))
-(def webview-bridge         (fn [] #js {:default #js {}}))
 (def webview                (fn [] #js {:WebView #js {}}))
 (def touchid                (fn [] #js {}))
 (def svg                    (fn [] #js {:default #js {}}))

ios/Podfile

@@ -45,6 +45,7 @@ target 'StatusIm' do
   pod 'SQLCipher', '~>3.0'
   pod 'SSZipArchive'
 
+
   target 'StatusImTests' do
     inherit! :search_paths
     # Pods for testing

ios/Podfile.lock

@@ -205,9 +205,7 @@ PODS:
     - React
   - react-native-splash-screen (3.2.0):
     - React
-  - react-native-webview (6.11.1):
-    - React
-  - react-native-webview-bridge (0.33.17):
+  - react-native-webview (8.0.7):
     - React
   - React-RCTActionSheet (0.61.5):
     - React-Core/RCTActionSheetHeaders (= 0.61.5)
@@ -244,11 +242,13 @@ PODS:
     - React-cxxreact (= 0.61.5)
     - React-jsi (= 0.61.5)
     - ReactCommon/jscallinvoker (= 0.61.5)
+  - ReactNativeDarkMode (0.2.2):
+    - React
   - RNCMaskedView (0.1.6):
     - React
   - RNFS (2.14.1):
     - React
-  - RNGestureHandler (1.5.3):
+  - RNGestureHandler (1.6.0):
     - React
   - RNImageCropPicker (0.25.3):
     - QBImagePickerController
@@ -259,6 +259,8 @@ PODS:
     - React
   - RNLanguages (3.0.2):
     - React
+  - RNReactNativeHapticFeedback (1.9.0):
+    - React
   - RNReanimated (1.7.0):
     - React
   - RNScreens (2.3.0):
@@ -302,7 +304,6 @@ DEPENDENCIES:
   - react-native-shake (from `../node_modules/react-native-shake`)
   - react-native-splash-screen (from `../node_modules/react-native-splash-screen`)
   - react-native-webview (from `../node_modules/react-native-webview`)
-  - react-native-webview-bridge (from `../node_modules/react-native-webview-bridge`)
   - React-RCTActionSheet (from `../node_modules/react-native/Libraries/ActionSheetIOS`)
   - React-RCTAnimation (from `../node_modules/react-native/Libraries/NativeAnimation`)
   - React-RCTBlob (from `../node_modules/react-native/Libraries/Blob`)
@@ -314,12 +315,14 @@ DEPENDENCIES:
   - React-RCTVibration (from `../node_modules/react-native/Libraries/Vibration`)
   - ReactCommon/jscallinvoker (from `../node_modules/react-native/ReactCommon`)
   - ReactCommon/turbomodule/core (from `../node_modules/react-native/ReactCommon`)
+  - ReactNativeDarkMode (from `../node_modules/react-native-dark-mode`)
   - "RNCMaskedView (from `../node_modules/@react-native-community/masked-view`)"
   - RNFS (from `../node_modules/react-native-fs`)
   - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
   - RNImageCropPicker (from `../node_modules/react-native-image-crop-picker`)
   - RNKeychain (from `../node_modules/react-native-keychain`)
   - RNLanguages (from `../node_modules/react-native-languages`)
+  - RNReactNativeHapticFeedback (from `../node_modules/react-native-haptic-feedback`)
   - RNReanimated (from `../node_modules/react-native-reanimated`)
   - RNScreens (from `../node_modules/react-native-screens`)
   - RNSVG (from `../node_modules/react-native-svg`)
@@ -383,8 +386,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-splash-screen"
   react-native-webview:
     :path: "../node_modules/react-native-webview"
-  react-native-webview-bridge:
-    :path: "../node_modules/react-native-webview-bridge"
   React-RCTActionSheet:
     :path: "../node_modules/react-native/Libraries/ActionSheetIOS"
   React-RCTAnimation:
@@ -405,6 +406,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native/Libraries/Vibration"
   ReactCommon:
     :path: "../node_modules/react-native/ReactCommon"
+  ReactNativeDarkMode:
+    :path: "../node_modules/react-native-dark-mode"
   RNCMaskedView:
     :path: "../node_modules/@react-native-community/masked-view"
   RNFS:
@@ -417,6 +420,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-keychain"
   RNLanguages:
     :path: "../node_modules/react-native-languages"
+  RNReactNativeHapticFeedback:
+    :path: "../node_modules/react-native-haptic-feedback"
   RNReanimated:
     :path: "../node_modules/react-native-reanimated"
   RNScreens:
@@ -453,8 +458,7 @@ SPEC CHECKSUMS:
   react-native-safe-area-context: e200d4433aba6b7e60b52da5f37af11f7a0b0392
   react-native-shake: de052eaa3eadc4a326b8ddd7ac80c06e8d84528c
   react-native-splash-screen: 200d11d188e2e78cea3ad319964f6142b6384865
-  react-native-webview: 0658813bcc4b6c22f3cbb035a2227aa896a8cbc0
-  react-native-webview-bridge: 3023f6b0e84cdf8e4a96511d2b04e73b038f95f0
+  react-native-webview: f51a7a42278b01b07464a65c586aa0086c1e741e
   React-RCTActionSheet: 600b4d10e3aea0913b5a92256d2719c0cdd26d76
   React-RCTAnimation: 791a87558389c80908ed06cc5dfc5e7920dfa360
   React-RCTBlob: d89293cc0236d9cb0933d85e430b0bbe81ad1d72
@@ -465,12 +469,14 @@ SPEC CHECKSUMS:
   React-RCTText: 9ccc88273e9a3aacff5094d2175a605efa854dbe
   React-RCTVibration: a49a1f42bf8f5acf1c3e297097517c6b3af377ad
   ReactCommon: 198c7c8d3591f975e5431bec1b0b3b581aa1c5dd
+  ReactNativeDarkMode: 0178ffca3b10f6a7c9f49d6f9810232b328fa949
   RNCMaskedView: a88953beefbd347a29072d9eba90e42945fe291e
   RNFS: a8fbe7060fa49157d819466404794ad9c58e58cf
-  RNGestureHandler: 02905abe54e1f6e59c081a10b4bd689721e17aa6
+  RNGestureHandler: dde546180bf24af0b5f737c8ad04b6f3fa51609a
   RNImageCropPicker: bfb3ea9c8622f290532e2fe63f369e0d5a52f597
   RNKeychain: 216f37338fcb9e5c3a2530f1e3295f737a690cb1
   RNLanguages: 962e562af0d34ab1958d89bcfdb64fafc37c513e
+  RNReactNativeHapticFeedback: 2566b468cc8d0e7bb2f84b23adc0f4614594d071
   RNReanimated: 031fe8d9ea93c2bd689a40f05320ef9d96f74d7f
   RNScreens: 03bf608b92ac0acf323f47d8f5b63a8f829340c8
   RNSVG: be27aa7c58819f97399388ae53d7fa0572f32c7f
@@ -480,6 +486,6 @@ SPEC CHECKSUMS:
   TouchID: ba4c656d849cceabc2e4eef722dea5e55959ecf4
   Yoga: f2a7cd4280bfe2cca5a7aed98ba0eb3d1310f18b
 
-PODFILE CHECKSUM: 0483a7693bfa7c6ef9f214cdc7f614f67dec7448
+PODFILE CHECKSUM: 37924c57abbfcd77aec07d65c45ecba137cdf289
 
 COCOAPODS: 1.8.4

ios/StatusIm.xcodeproj/project.pbxproj

@@ -647,6 +647,7 @@
 					"$(SRCROOT)/../node_modules/react-native-image-resizer/ios/RCTImageResizer",
 					"$(SRCROOT)/../node_modules/react-native-splash-screen/ios",
 					"$(SRCROOT)/../node_modules/react-native-config/ios/**",
+					"$(SRCROOT)/../node_modules/react-native-webview/ios",
 					"$(SRCROOT)/../node_modules/react-native/Libraries/LinkingIOS",
 				);
 				INFOPLIST_FILE = StatusIm/Info.plist;
@@ -696,6 +697,7 @@
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../node_modules/react-native/React/**",
 					"$(SRCROOT)/../node_modules/react-native-camera/ios",
+					"$(SRCROOT)/../node_modules/react-native-webview/ios",
 					"$(SRCROOT)/../node_modules/react-native-fs/**",
 					"$(SRCROOT)/../node_modules/react-native-languages/RNLanguages",
 					"$(SRCROOT)/../modules/react-native-status/ios/RCTStatus/**",
@@ -782,6 +784,7 @@
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../node_modules/react-native/React/**",
 					"$(SRCROOT)/../node_modules/react-native-camera/ios",
+					"$(SRCROOT)/../node_modules/react-native-webview/ios",
 					"$(SRCROOT)/../node_modules/react-native-fs/**",
 					"$(SRCROOT)/../node_modules/react-native-languages/RNLanguages",
 					"$(SRCROOT)/../modules/react-native-status/ios/RCTStatus/**",
@@ -845,6 +848,7 @@
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
 					"$(SRCROOT)/../node_modules/react-native/React/**",
 					"$(SRCROOT)/../node_modules/react-native-camera/ios",
+					"$(SRCROOT)/../node_modules/react-native-webview/ios",
 					"$(SRCROOT)/../node_modules/react-native-fs/**",
 					"$(SRCROOT)/../node_modules/react-native-languages/RNLanguages",
 					"$(SRCROOT)/../modules/react-native-status/ios/RCTStatus/**",

ios/StatusIm/Images.xcassets/appearance.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "appearance.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "appearance@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "appearance@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

ios/StatusIm/Images.xcassets/nfc.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "nfc.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "nfc-1.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "nfc-2.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

ios/StatusIm/Info.plist

@@ -2,8 +2,6 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>UIUserInterfaceStyle</key>
-	<string>Light</string>
 	<key>CFBundleBuildUrl</key>
 	<string>????</string>
 	<key>NSFaceIDUsageDescription</key>
@@ -78,9 +76,7 @@
 		</dict>
 	</dict>
 	<key>NSCameraUsageDescription</key>
-	<string>Please allow Status to use your phone camera</string>
-	<key>NSContactsUsageDescription</key>
-	<string>We need to access your contacts</string>
+	<string>The app uses your camera to scan QR codes.</string>
 	<key>NSLocationAlwaysUsageDescription</key>
 	<string>Location access is required for some DApps to function properly.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>

ios/launch-image-universal.storyboard

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Lsa-QA-3zn">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Lsa-QA-3zn">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -20,9 +19,10 @@
                             <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="launch_image" translatesAutoresizingMaskIntoConstraints="NO" id="cqW-9w-FC0">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                             </imageView>
                         </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <viewLayoutGuide key="safeArea" id="2aN-f8-qiu"/>
                     </view>
                 </viewController>
@@ -32,6 +32,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="launch_image" width="164" height="169"/>
+        <image name="launch_image" width="90" height="101"/>
     </resources>
 </document>

mobile/js_files/DEPENDENCIES.md

@@ -152,7 +152,7 @@ TODO: updating requires a pod update on iOS
 
 used for touch-id identification
 
-## "react-native-webview-bridge": "git+https://github.com/status-im/react-native-webview-bridge.git#fix/classnames-colision"
+## "react-native-webview": "git+https://github.com/status-im/react-native-webview.git#v8.0.7_3"
 
 used for browser
 

mobile/js_files/package.json

@@ -28,10 +28,12 @@
     "react-native-background-timer": "^2.1.1",
     "react-native-camera": "^3.3.3",
     "react-native-config": "git+https://github.com/status-im/react-native-config.git#0.11.2-1-status",
+    "react-native-dark-mode": "^0.2.2",
     "react-native-dialogs": "^1.0.4",
     "react-native-fetch-polyfill": "^1.1.2",
     "react-native-fs": "^2.14.1",
-    "react-native-gesture-handler": "^1.5.3",
+    "react-native-gesture-handler": "^1.6.0",
+    "react-native-haptic-feedback": "^1.9.0",
     "react-native-image-crop-picker": "^0.25.0",
     "react-native-image-resizer": "git+https://github.com/status-im/react-native-image-resizer.git#1.0.0-1-status",
     "react-native-keychain": "git+https://github.com/status-im/react-native-keychain.git#v.3.0.0-status",
@@ -39,15 +41,15 @@
     "react-native-mail": "git+https://github.com/status-im/react-native-mail.git#v4.0.0-status",
     "react-native-navigation-twopane": "git+https://github.com/status-im/react-native-navigation-twopane.git#v0.0.2-status",
     "react-native-reanimated": "^1.7.0",
+    "react-native-redash": "^10.0.1",
     "react-native-safe-area-context": "^0.7.3",
     "react-native-screens": "^2.3.0",
     "react-native-shake": "^3.3.1",
     "react-native-splash-screen": "^3.2.0",
-    "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#v2.5.20",
+    "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#v2.5.21",
     "react-native-svg": "^9.8.4",
     "react-native-touch-id": "^4.4.1",
-    "react-native-webview": "^6.11.1",
-    "react-native-webview-bridge": "git+https://github.com/status-im/react-native-webview-bridge.git#fix/community-webview",
+    "react-native-webview": "git+https://github.com/status-im/react-native-webview.git#v8.0.7_6",
     "web3-utils": "^1.2.1"
   },
   "devDependencies": {

mobile/js_files/yarn.lock

@@ -838,6 +838,13 @@
     exec-sh "^0.3.2"
     minimist "^1.2.0"
 
+"@egjs/hammerjs@^2.0.17":
+  version "2.0.17"
+  resolved "https://registry.yarnpkg.com/@egjs/hammerjs/-/hammerjs-2.0.17.tgz#5dc02af75a6a06e4c2db0202cae38c9263895124"
+  integrity sha512-XQsZgjm2EcVUiZQf11UBJQfmZeEmOW8DpI1gsFeln6w0ae0ii4dMQEQ0kjl6DspdWX1aGY1/loyXnP0JS06e/A==
+  dependencies:
+    "@types/hammerjs" "^2.0.36"
+
 "@hapi/address@2.x.x":
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.2.tgz#1c794cd6dbf2354d1eb1ef10e0303f573e1c7222"
@@ -1056,6 +1063,16 @@
     color "^3.1.2"
     react-native-iphone-x-helper "^1.2.1"
 
+"@types/events@*":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
+  integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
+
+"@types/hammerjs@^2.0.36":
+  version "2.0.36"
+  resolved "https://registry.yarnpkg.com/@types/hammerjs/-/hammerjs-2.0.36.tgz#17ce0a235e9ffbcdcdf5095646b374c2bf615a4c"
+  integrity sha512-7TUK/k2/QGpEAv/BCwSHlYu3NXZhQ9ZwBYpzr9tjlPIL2C5BeGhH3DmVavRx3ZNyELX5TLC91JTz/cen6AAtIQ==
+
 "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
@@ -1076,6 +1093,26 @@
     "@types/istanbul-lib-coverage" "*"
     "@types/istanbul-lib-report" "*"
 
+"@types/prop-types@*":
+  version "15.7.3"
+  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7"
+  integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw==
+
+"@types/react-native@*":
+  version "0.61.23"
+  resolved "https://registry.yarnpkg.com/@types/react-native/-/react-native-0.61.23.tgz#bff4e0311c229a5203eb37aacd4febf59f3e2980"
+  integrity sha512-upHmySsrVBDBokWWhYIKkKnpvadsHdioSjbBTu4xl7fjN0yb94KR5ngUOBXsyqAYqQzF+hP6qpvobG9M7Jr6hw==
+  dependencies:
+    "@types/react" "*"
+
+"@types/react@*":
+  version "16.9.23"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-16.9.23.tgz#1a66c6d468ba11a8943ad958a8cb3e737568271c"
+  integrity sha512-SsGVT4E7L2wLN3tPYLiF20hmZTPGuzaayVunfgXzUn1x4uHVsKH6QDJQ/TdpHqwsTLd4CwrmQ2vOgxN7gE24gw==
+  dependencies:
+    "@types/prop-types" "*"
+    csstype "^2.2.0"
+
 "@types/stack-utils@^1.0.1":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
@@ -1105,6 +1142,11 @@ abort-controller@^3.0.0:
   dependencies:
     event-target-shim "^5.0.0"
 
+abs-svg-path@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/abs-svg-path/-/abs-svg-path-0.1.1.tgz#df601c8e8d2ba10d4a76d625e236a9a39c2723bf"
+  integrity sha1-32Acjo0roQ1KdtYl4japo5wnI78=
+
 absolute-path@^0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/absolute-path/-/absolute-path-0.0.0.tgz#a78762fbdadfb5297be99b15d35a785b2f095bf7"
@@ -1974,6 +2016,11 @@ cross-spawn@^6.0.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
+csstype@^2.2.0:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.9.tgz#05141d0cd557a56b8891394c1911c40c8a98d098"
+  integrity sha512-xz39Sb4+OaTsULgUERcCk+TJj8ylkL4aSVDQiX/ksxbELSqwkgt4d4RD7fovIdgJGSuNYqwZEiVjYY5l0ask+Q==
+
 damerau-levenshtein@^1.0.0:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz#780cf7144eb2e8dbd1c3bb83ae31100ccc31a414"
@@ -2247,16 +2294,16 @@ escape-html@~1.0.3:
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
   integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
 
-escape-string-regexp@1.0.5, escape-string-regexp@^1.0.5:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
-
-escape-string-regexp@^2.0.0:
+escape-string-regexp@2.0.0, escape-string-regexp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
   integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
 
+escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+
 eslint-plugin-jsx-a11y@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-5.1.1.tgz#5c96bb5186ca14e94db1095ff59b3e2bd94069b1"
@@ -2319,6 +2366,11 @@ eventemitter3@^3.0.0:
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7"
   integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==
 
+events@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz#84279af1b34cb75aa88bf5ff291f6d0bd9b31a59"
+  integrity sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==
+
 exec-sh@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.2.tgz#6738de2eb7c8e671d0366aea0b0db8c6f7d7391b"
@@ -2755,11 +2807,6 @@ growly@^1.3.0:
   resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081"
   integrity sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=
 
-hammerjs@^2.0.8:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/hammerjs/-/hammerjs-2.0.8.tgz#04ef77862cff2bb79d30f7692095930222bf60f1"
-  integrity sha1-BO93hiz/K7edMPdpIJWTAiK/YPE=
-
 handlebars@^4.1.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.4.2.tgz#8810a9821a9d6d52cb2f57d326d6ce7c3dfe741d"
@@ -2986,13 +3033,6 @@ inquirer@^3.0.6:
     strip-ansi "^4.0.0"
     through "^2.3.6"
 
-invariant@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.0.tgz#c8d7e847366a49cc18b622f058a689d481e895f2"
-  integrity sha1-yNfoRzZqScwYtiLwWKaJ1IHolfI=
-  dependencies:
-    loose-envify "^1.0.0"
-
 invariant@2.2.4, invariant@^2.2.2, invariant@^2.2.4, invariant@^2.2.x:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
@@ -3471,11 +3511,6 @@ jsx-ast-utils@^1.4.0:
   resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-1.4.1.tgz#3867213e8dd79bf1e8f2300c0cfc1efb182c0df1"
   integrity sha1-OGchPo3Xm/Ho8jAMDPwe+xgsDfE=
 
-keymirror@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/keymirror/-/keymirror-0.1.1.tgz#918889ea13f8d0a42e7c557250eee713adc95c35"
-  integrity sha1-kYiJ6hP40KQufFVyUO7nE63JXDU=
-
 kind-of@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44"
@@ -4240,6 +4275,13 @@ normalize-path@^2.1.1:
   dependencies:
     remove-trailing-separator "^1.0.1"
 
+normalize-svg-path@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/normalize-svg-path/-/normalize-svg-path-1.0.1.tgz#6f729ad6b70bb4ca4eff2fe4b107489efe1d56fe"
+  integrity sha1-b3Ka1rcLtMpO/y/ksQdInv4dVv4=
+  dependencies:
+    svg-arc-to-cubic-bezier "^3.0.0"
+
 npm-bundled@^1.0.1:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.6.tgz#e7ba9aadcef962bb61248f91721cd932b3fe6bdd"
@@ -4569,6 +4611,11 @@ parse-node-version@^1.0.0:
   resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
   integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
 
+parse-svg-path@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/parse-svg-path/-/parse-svg-path-0.1.2.tgz#7a7ec0d1eb06fa5325c7d3e009b859a09b5d49eb"
+  integrity sha1-en7A0esG+lMlx9PgCbhZoJtdSes=
+
 parseurl@~1.3.3:
   version "1.3.3"
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
@@ -4860,6 +4907,17 @@ react-native-camera@^3.3.3:
   version "0.11.2"
   resolved "git+https://github.com/status-im/react-native-config.git#f48d41012f812e1fc9dd6a78e874e3271e5e385e"
 
+react-native-dark-mode@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/react-native-dark-mode/-/react-native-dark-mode-0.2.2.tgz#4faa335e36330bfca832ba8b3d2bd84c7b880381"
+  integrity sha512-2vhWOOimU7DRKYjCU/pdv0+JpnGKURq5+c7bre093Jtzk57HtlJfd+ViibbC9Y8zh0viIOyKtfL5mYhVhZ6Crw==
+  dependencies:
+    "@types/events" "*"
+    "@types/react" "*"
+    "@types/react-native" "*"
+    events "^3.0.0"
+    toolkit.ts "^0.0.2"
+
 react-native-dialogs@^1.0.4:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/react-native-dialogs/-/react-native-dialogs-1.1.0.tgz#8f7ee7f9d96574fc878fb7c1be101611fb4af517"
@@ -4878,16 +4936,21 @@ react-native-fs@^2.14.1:
     base-64 "^0.1.0"
     utf8 "^2.1.1"
 
-react-native-gesture-handler@^1.5.3:
-  version "1.5.3"
-  resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.5.3.tgz#191b44701fab7ba54c27a2438cb5eaa252666e66"
-  integrity sha512-y2/jw0uHAQtEPR02PHAah6tdMymrVtZFoHqjlEWdhK807w2sgU5CySYINK/nOTczd+zB4GMX+9euA3VfbGJ5aA==
+react-native-gesture-handler@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/react-native-gesture-handler/-/react-native-gesture-handler-1.6.0.tgz#e9a4e1d0c7ac21eb0d6b6ec013e73f9c0c33a629"
+  integrity sha512-KulGCWKTxa6xBpPP4LWEPmmLqBqOe2jbtdlILOVF/dR4EgImiaBVrKdOHeRMyMzJOYAWxs5uDZsyA8hgSsm+lw==
   dependencies:
-    hammerjs "^2.0.8"
+    "@egjs/hammerjs" "^2.0.17"
     hoist-non-react-statics "^2.3.1"
     invariant "^2.2.4"
     prop-types "^15.7.2"
 
+react-native-haptic-feedback@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/react-native-haptic-feedback/-/react-native-haptic-feedback-1.9.0.tgz#7d62c54536f04dd5d8f1c2bb8ee444009f2294b9"
+  integrity sha512-tIRbq8k7HK9AoyvXrOHUEFmJd65ZAh1HP9mDyD/gDisG1ApY4Im9UKn0q0of9z7s8AJY3sZA9GMuSKdSBGdKKQ==
+
 react-native-image-crop-picker@^0.25.0:
   version "0.25.3"
   resolved "https://registry.yarnpkg.com/react-native-image-crop-picker/-/react-native-image-crop-picker-0.25.3.tgz#46ee28b4a0a187240e388bd28a44cf8c274caec6"
@@ -4924,6 +4987,16 @@ react-native-reanimated@^1.7.0:
   resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-1.7.0.tgz#896db2576552ac59d288a1f6c7f00afc171f240c"
   integrity sha512-FQWSqP605eQVJumuK2HpR+7heF0ZI+qfy4jNguv3Xv8nPFHeIgZaRTXHCEQL2AcuSIj50zy8jGJf5l134QMQWQ==
 
+react-native-redash@^10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/react-native-redash/-/react-native-redash-10.0.1.tgz#ffcc554e407b0382635ab1370c9c52b1706d8af1"
+  integrity sha512-oXmYqr6NM3I5FTGpG5Yt4HkTafoSCjgy63nTSSGvQv3IUnHhUjHge7v+boUd8boZWkor96pMwNsb5pKREGDacQ==
+  dependencies:
+    abs-svg-path "^0.1.1"
+    normalize-svg-path "^1.0.1"
+    parse-svg-path "^0.1.2"
+    use-memo-one "^1.1.1"
+
 react-native-safe-area-context@^0.7.3:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/react-native-safe-area-context/-/react-native-safe-area-context-0.7.3.tgz#ad6bd4abbabe195332c53810e4ce5851eb21aa2a"
@@ -4948,9 +5021,9 @@ react-native-splash-screen@^3.2.0:
   resolved "https://registry.yarnpkg.com/react-native-splash-screen/-/react-native-splash-screen-3.2.0.tgz#d47ec8557b1ba988ee3ea98d01463081b60fff45"
   integrity sha512-Ls9qiNZzW/OLFoI25wfjjAcrf2DZ975hn2vr6U9gyuxi2nooVbzQeFoQS5vQcbCt9QX5NY8ASEEAtlLdIa6KVg==
 
-"react-native-status-keycard@git+https://github.com/status-im/react-native-status-keycard.git#v2.5.20":
+"react-native-status-keycard@git+https://github.com/status-im/react-native-status-keycard.git#v2.5.21":
   version "2.5.17"
-  resolved "git+https://github.com/status-im/react-native-status-keycard.git#38ca8597e26472f0d257467652544df084de6345"
+  resolved "git+https://github.com/status-im/react-native-status-keycard.git#900de62a4c77b6baeca6a7341994de8a1d95ae4f"
 
 react-native-svg@^9.8.4:
   version "9.11.1"
@@ -4962,20 +5035,11 @@ react-native-touch-id@^4.4.1:
   resolved "https://registry.yarnpkg.com/react-native-touch-id/-/react-native-touch-id-4.4.1.tgz#8b1bb2d04c30bac36bb9696d2d723e719c4a8b08"
   integrity sha512-1jTl8fC+0fxvqegy/XXTyo6vMvPhjzkoDdaqoYZx0OH8AT250NuXnNPyKktvigIcys3+2acciqOeaCall7lrvg==
 
-"react-native-webview-bridge@git+https://github.com/status-im/react-native-webview-bridge.git#fix/community-webview":
-  version "0.33.17"
-  resolved "git+https://github.com/status-im/react-native-webview-bridge.git#55acc0cb683dc239673bbe5a94b1f13e7b90e1f7"
+"react-native-webview@git+https://github.com/status-im/react-native-webview.git#v8.0.7_6":
+  version "8.0.7"
+  resolved "git+https://github.com/status-im/react-native-webview.git#5578e63fc609b770408ddbdead5a4a211c45218b"
   dependencies:
-    invariant "2.2.0"
-    keymirror "0.1.1"
-    react-native-webview "^6.11.1"
-
-react-native-webview@^6.11.1:
-  version "6.11.1"
-  resolved "https://registry.yarnpkg.com/react-native-webview/-/react-native-webview-6.11.1.tgz#51fab0838ef9bdf3efd0d3f27147dddda5119f94"
-  integrity sha512-0OaNCEzdyywJZ70y6Z4fmmuAd2AHYq2AEByIr15z3YetpMXhm9lXUe2V/8BXQIZXeC9FJosj2DAKu48lpZ0nEg==
-  dependencies:
-    escape-string-regexp "1.0.5"
+    escape-string-regexp "2.0.0"
     invariant "2.2.4"
 
 react-native@0.61.5:
@@ -5805,6 +5869,11 @@ supports-color@^6.1.0:
   dependencies:
     has-flag "^3.0.0"
 
+svg-arc-to-cubic-bezier@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/svg-arc-to-cubic-bezier/-/svg-arc-to-cubic-bezier-3.2.0.tgz#390c450035ae1c4a0104d90650304c3bc814abe6"
+  integrity sha512-djbJ/vZKZO+gPoSDThGNpKDO+o+bAeA4XQKovvkNCqnIS2t+S4qnLAGQhyyrulhCFRl1WWzAp0wUDV8PpTVU3g==
+
 symbol-observable@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
@@ -5921,6 +5990,11 @@ toidentifier@1.0.0:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
   integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
 
+toolkit.ts@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/toolkit.ts/-/toolkit.ts-0.0.2.tgz#91bde730e5e6ad1a22146cdaf83f4a52721cf3b2"
+  integrity sha512-yJJTVbCwiD6AfFgReewJCGJuODmyZUeL1sDjnxp33t0UBxnezgQrLbz/F9++RC28CTlk5u5pVji4TbeondYEkw==
+
 tough-cookie@~2.4.3:
   version "2.4.3"
   resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
@@ -6060,6 +6134,11 @@ url-set-query@^1.0.0:
   resolved "https://registry.yarnpkg.com/url-set-query/-/url-set-query-1.0.0.tgz#016e8cfd7c20ee05cafe7795e892bd0702faa339"
   integrity sha1-AW6M/Xwg7gXK/neV6JK9BwL6ozk=
 
+use-memo-one@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/use-memo-one/-/use-memo-one-1.1.1.tgz#39e6f08fe27e422a7d7b234b5f9056af313bd22c"
+  integrity sha512-oFfsyun+bP7RX8X2AskHNTxu+R3QdE/RC5IefMbqptmACAA/gfol1KDD5KRzPsGMa62sWxGZw+Ui43u6x4ddoQ==
+
 use-subscription@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/use-subscription/-/use-subscription-1.3.0.tgz#3df13a798e826c8d462899423293289a3362e4e6"

nix/mobile/android/jsbundle/default.nix

@@ -3,7 +3,7 @@
 #
 
 { target-os ? "android",
-  stdenv, mkFilter, clojure, leiningen, nodejs,
+  stdenv, mkFilter, clojure, leiningen, nodejs, bash, git,
   leinProjectDeps, localMavenRepoBuilder, projectNodePackage }:
 
 let
@@ -20,16 +20,30 @@ in stdenv.mkDerivation {
       filter =
         # Keep this filter as restrictive as possible in order to avoid unnecessary rebuilds and limit closure size
         mkFilter {
-          dirRootsToInclude = [ 
-            "components/src" "react-native/src/cljsjs" "react-native/src/mobile" "src" "env/prod" "prod" # Taken from project.clj :profiles :prod :cljsbuild :builds :android :source-paths
-            "resources" "status-modules/cljs" "status-modules/resources" "scripts/version"
-          ];
-          dirsToExclude = [ ".git" ".svn" "CVS" ".hg" ".gradle" "build" "intermediates" "libs" "obj" ];
-          filesToInclude = [ "build.clj" "externs.js" "project.clj" "prepare-modules.js" "VERSION" "BUILD_NUMBER"];
           root = path;
+          ignoreVCS = false;
+          include = [ 
+            "VERSION" "BUILD_NUMBER" "scripts/version/.*"
+            # I want to avoid including the whole .git directory
+            ".git/HEAD" ".git/objects" ".git/refs/heads/.*"
+            "src/.*" "prod/.*" "env/prod/.*"
+            "components/src/.*" 
+            "react-native/src" 
+            "react-native/src/cljsjs/.*"
+            "react-native/src/mobile/.*"
+            "status-modules/cljs/.*"
+            "status-modules/resources/.*"
+            "build.clj" "externs.js"
+            "project.clj" "prepare-modules.js"
+            # lein jsbundle stat's images to check if they exist
+            "resources/.*"
+          ];
+          exclude = [
+            "resources/fonts/.*"
+          ];
         };
     };
-  buildInputs = [ clojure leiningen nodejs ];
+  buildInputs = [ clojure leiningen nodejs bash git ];
 
   LEIN_OFFLINE = "y";
 

nix/mobile/android/maven-and-npm-deps/default.nix

@@ -37,14 +37,14 @@ let
             filter =
               # Keep this filter as restrictive as possible in order to avoid unnecessary rebuilds and limit closure size
               mkFilter {
-                dirRootsToInclude = [
-                  "android" "mobile/js_files" "resources"
-                  "translations" "status-modules"
-                ];
-                dirsToExclude = [ ".git" ".svn" "CVS" ".hg" ".gradle" "build" "intermediates" "libs" "obj" ];
-                filesToInclude = [ ".babelrc" ];
-                filesToExclude = [ "VERSION" "android/gradlew" ];
                 root = path;
+                include = [
+                  "android/.*" "translations/.*" "status-modules/.*"
+                  "resources/.*" "mobile/js_files/.*" ".babelrc"
+                ];
+                exclude = [
+                  ".*.keystore" "node_modules"
+                ];
               };
           };
         phases = [ "unpackPhase" "patchPhase" "installPhase" "fixupPhase" ];

nix/mobile/android/maven-and-npm-deps/maven/maven-inputs.txt

@@ -66,33 +66,40 @@ https://dl.google.com/dl/android/maven2/androidx/versionedparcelable/versionedpa
 https://dl.google.com/dl/android/maven2/androidx/versionedparcelable/versionedparcelable/1.1.0/versionedparcelable-1.1.0
 https://dl.google.com/dl/android/maven2/androidx/viewpager/viewpager/1.0.0/viewpager-1.0.0
 https://dl.google.com/dl/android/maven2/androidx/viewpager2/viewpager2/1.0.0/viewpager2-1.0.0
+https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.0.0/baseLibrary-3.0.0
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.0.1/baseLibrary-3.0.1
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.2.1/baseLibrary-3.2.1
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.3.1/baseLibrary-3.3.1
 https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.4.1/baseLibrary-3.4.1
+https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCommon/3.0.0/compilerCommon-3.0.0
 https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCommon/3.0.1/compilerCommon-3.0.1
 https://dl.google.com/dl/android/maven2/com/android/support/appcompat-v7/28.0.0/appcompat-v7-28.0.0
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/26.2.1/crash-26.2.1
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/26.3.1/crash-26.3.1
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/crash/26.4.1/crash-26.4.1
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.0.0/protos-26.0.0
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.0.1/protos-26.0.1
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.2.1/protos-26.2.1
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.3.1/protos-26.3.1
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.4.1/protos-26.4.1
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.0.0/shared-26.0.0
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.0.1/shared-26.0.1
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.2.1/shared-26.2.1
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.3.1/shared-26.3.1
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.4.1/shared-26.4.1
+https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.0.0/tracker-26.0.0
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.0.1/tracker-26.0.1
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.2.1/tracker-26.2.1
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.3.1/tracker-26.3.1
 https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.4.1/tracker-26.4.1
+https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.0/annotations-26.0.0
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.1/annotations-26.0.1
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.2.1/annotations-26.2.1
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.3.1/annotations-26.3.1
 https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.4.1/annotations-26.4.1
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2-proto/0.3.1/aapt2-proto-0.3.1
 https://dl.google.com/dl/android/maven2/com/android/tools/build/aapt2/3.4.1-5326820/aapt2-3.4.1-5326820
+https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.0/apksig-3.0.0
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.1/apksig-3.0.1
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.2.1/apksig-3.2.1
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.3.1/apksig-3.3.1
@@ -100,14 +107,17 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.4.1/apk
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.2.1/apkzlib-3.2.1
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.3.1/apkzlib-3.3.1
 https://dl.google.com/dl/android/maven2/com/android/tools/build/apkzlib/3.4.1/apkzlib-3.4.1
+https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.0.0/builder-model-3.0.0
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.0.1/builder-model-3.0.1
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.2.1/builder-model-3.2.1
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.3.1/builder-model-3.3.1
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.4.1/builder-model-3.4.1
+https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.0.0/builder-test-api-3.0.0
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.0.1/builder-test-api-3.0.1
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.2.1/builder-test-api-3.2.1
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.3.1/builder-test-api-3.3.1
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.4.1/builder-test-api-3.4.1
+https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0.0/builder-3.0.0
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0.1/builder-3.0.1
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.2.1/builder-3.2.1
 https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.3.1/builder-3.3.1
@@ -115,11 +125,14 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.4.1/bu
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.5.0/bundletool-0.5.0
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.6.0/bundletool-0.6.0
 https://dl.google.com/dl/android/maven2/com/android/tools/build/bundletool/0.7.2/bundletool-0.7.2
+https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.0.0/gradle-api-3.0.0
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.0.1/gradle-api-3.0.1
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.2.1/gradle-api-3.2.1
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.3.1/gradle-api-3.3.1
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.4.1/gradle-api-3.4.1
+https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core/3.0.0/gradle-core-3.0.0
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core/3.0.1/gradle-core-3.0.1
+https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.0/gradle-3.0.0
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.1/gradle-3.0.1
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.2.1/gradle-3.2.1
 https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.3.1/gradle-3.3.1
@@ -130,50 +143,63 @@ https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifie
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-processor/1.0.0-alpha10/jetifier-processor-1.0.0-alpha10
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-processor/1.0.0-beta02/jetifier-processor-1.0.0-beta02
 https://dl.google.com/dl/android/maven2/com/android/tools/build/jetifier/jetifier-processor/1.0.0-beta04/jetifier-processor-1.0.0-beta04
+https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.0.0/manifest-merger-26.0.0
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.0.1/manifest-merger-26.0.1
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.2.1/manifest-merger-26.2.1
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.3.1/manifest-merger-26.3.1
 https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.4.1/manifest-merger-26.4.1
 https://dl.google.com/dl/android/maven2/com/android/tools/build/transform-api/2.0.0-deprecated-use-gradle-api/transform-api-2.0.0-deprecated-use-gradle-api
+https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.0/common-26.0.0
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.1/common-26.0.1
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.2.1/common-26.2.1
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.3.1/common-26.3.1
 https://dl.google.com/dl/android/maven2/com/android/tools/common/26.4.1/common-26.4.1
+https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.0/ddmlib-26.0.0
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.0.1
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.2.1/ddmlib-26.2.1
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.3.1/ddmlib-26.3.1
 https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.4.1/ddmlib-26.4.1
+https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.0/dvlib-26.0.0
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.1/dvlib-26.0.1
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.2.1/dvlib-26.2.1
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.3.1/dvlib-26.3.1
 https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.4.1/dvlib-26.4.1
+https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/26.0.0/intellij-core-26.0.0
 https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/26.0.1/intellij-core-26.0.1
 https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/26.4.1/intellij-core-26.4.1
 https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/kotlin-compiler/26.4.1/kotlin-compiler-26.4.1
+https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/26.0.0/uast-26.0.0
 https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/26.0.1/uast-26.0.1
 https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/26.4.1/uast-26.4.1
+https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.0.0/layoutlib-api-26.0.0
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.0.1/layoutlib-api-26.0.1
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.2.1/layoutlib-api-26.2.1
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.3.1/layoutlib-api-26.3.1
 https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.4.1/layoutlib-api-26.4.1
+https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.0.0/lint-api-26.0.0
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.0.1/lint-api-26.0.1
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.4.1/lint-api-26.4.1
+https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.0.0/lint-checks-26.0.0
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.0.1/lint-checks-26.0.1
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.4.1/lint-checks-26.4.1
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.2.1/lint-gradle-api-26.2.1
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.3.1/lint-gradle-api-26.3.1
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle-api/26.4.1/lint-gradle-api-26.4.1
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-gradle/26.4.1/lint-gradle-26.4.1
+https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.0/lint-26.0.0
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.1/lint-26.0.1
 https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.4.1/lint-26.4.1
+https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.0/repository-26.0.0
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.1/repository-26.0.1
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.2.1/repository-26.2.1
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.3.1/repository-26.3.1
 https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.4.1/repository-26.4.1
+https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.0/sdk-common-26.0.0
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.1/sdk-common-26.0.1
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.2.1/sdk-common-26.2.1
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.3.1/sdk-common-26.3.1
 https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.4.1/sdk-common-26.4.1
+https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.0/sdklib-26.0.0
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.1/sdklib-26.0.1
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.2.1/sdklib-26.2.1
 https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.3.1/sdklib-26.3.1

nix/mobile/android/maven-and-npm-deps/maven/maven-sources.nix

@@ -1040,6 +1040,21 @@ in {
       sha256 = "1bvm08rj02f9lzz5mf3rki6ybknjb1z2iilnh7a7q96cshqh0p79";
     };
   };
+  "https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.0.0/baseLibrary-3.0.0" =
+  {
+    host = repositories.google;
+    path =
+      "com/android/databinding/baseLibrary/3.0.0/baseLibrary-3.0.0";
+    type = "jar";
+    pom = {
+      sha1 = "4a8ee25298c652798f2bd8a1d1aab5e943b9d601";
+      sha256 = "150bmgklpfinmsrlcg9s426pg9vs9szl1xdhz9vjmfdf6q2jpq1g";
+    };
+    jar = {
+      sha1 = "223fbb31236b0714328c415c1475fc8f55a4416e";
+      sha256 = "18j8j2mlzg1crqk31529y8qgx0bdhr98bf8vfq6rsvv3rn49f7rf";
+    };
+  };
   "https://dl.google.com/dl/android/maven2/com/android/databinding/baseLibrary/3.0.1/baseLibrary-3.0.1" =
   {
     host = repositories.google;
@@ -1100,6 +1115,21 @@ in {
       sha256 = "0wp2m15sm187swbknkgfl92kdz9sjzhjayrv6nihz11yv324vf5h";
     };
   };
+  "https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCommon/3.0.0/compilerCommon-3.0.0" =
+  {
+    host = repositories.google;
+    path =
+      "com/android/databinding/compilerCommon/3.0.0/compilerCommon-3.0.0";
+    type = "jar";
+    pom = {
+      sha1 = "6d366470bcc2b81c66400a9c69bcade266cb83aa";
+      sha256 = "04591ic395xxkrvnazik9hfsavh461r2fwsfjv4mjd0riwdmz5kv";
+    };
+    jar = {
+      sha1 = "243ebf26597dca96c60681106157e27f0762edf9";
+      sha256 = "1bpvsq8jr4hpwa771mha0mx8v9fbn00k9bs7hhizb47phfdxdpg3";
+    };
+  };
   "https://dl.google.com/dl/android/maven2/com/android/databinding/compilerCommon/3.0.1/compilerCommon-3.0.1" =
   {
     host = repositories.google;
@@ -1175,6 +1205,21 @@ in {
       sha256 = "1nqlhwd9vqi3qgb7s54prn2fx0ddcckzqn63l3a3mjjb67d9j1dc";
     };
   };
+  "https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.0.0/protos-26.0.0" =
+  {
+    host = repositories.google;
+    path =
+      "com/android/tools/analytics-library/protos/26.0.0/protos-26.0.0";
+    type = "jar";
+    pom = {
+      sha1 = "04fc6ffa9c1e43cbd58c62d81c55a55da5baf80c";
+      sha256 = "1sw6pjch8qqhydwqmwwb84cwxmxrbb04x2bj5q0igg98rm2b83vc";
+    };
+    jar = {
+      sha1 = "9700759196d267fc7cf3c85806c157050ea37dc9";
+      sha256 = "1c5dj1iygs8mv09qi6djwsb5ywsxb56yacpfg7k8pvrjx3ayncj2";
+    };
+  };
   "https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/protos/26.0.1/protos-26.0.1" =
   {
     host = repositories.google;
@@ -1235,6 +1280,21 @@ in {
       sha256 = "0d87m41ckp0163bpxsc562xc86raqjc872yjjiwby9vxjbx73y5j";
     };
   };
+  "https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.0.0/shared-26.0.0" =
+  {
+    host = repositories.google;
+    path =
+      "com/android/tools/analytics-library/shared/26.0.0/shared-26.0.0";
+    type = "jar";
+    pom = {
+      sha1 = "c41a448d5cd94b349b12a4ca13005cb2470181be";
+      sha256 = "0cqymxirzrwpnjwnkagfgf9xx8wyf3w73wj8hs5dmyaznjwds02z";
+    };
+    jar = {
+      sha1 = "bf1943bf2ff33b50f8f18e25353cd82d70ab24ba";
+      sha256 = "0i3pr82km4pm22fdhw7nyr0cvwp92jnw9wvi6s38frlc2cj40ac9";
+    };
+  };
   "https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/shared/26.0.1/shared-26.0.1" =
   {
     host = repositories.google;
@@ -1295,6 +1355,21 @@ in {
       sha256 = "00h7ybbbin5639vmpq7nb6660mji2px1h4hmshc12wgnbcpb0s11";
     };
   };
+  "https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.0.0/tracker-26.0.0" =
+  {
+    host = repositories.google;
+    path =
+      "com/android/tools/analytics-library/tracker/26.0.0/tracker-26.0.0";
+    type = "jar";
+    pom = {
+      sha1 = "70bbb640b9c8d187263a03fbf9858fc638c2c11b";
+      sha256 = "17id91rl0rg2xvvglqllrldjl7yxbcz4s8qwpw8zqp4vqf2mc9x9";
+    };
+    jar = {
+      sha1 = "f75df0e15d6db4ed1ba42e9d22bde29868db3f0f";
+      sha256 = "1cigmc4s4hav70g7ly8q0ml3awnqaja20xvrv6clrgcppikl49m6";
+    };
+  };
   "https://dl.google.com/dl/android/maven2/com/android/tools/analytics-library/tracker/26.0.1/tracker-26.0.1" =
   {
     host = repositories.google;
@@ -1355,6 +1430,21 @@ in {
       sha256 = "081w2pzq4x2v18a5nbanrr5alnrapdigd7q23w8j4kgq5ir7yb4p";
     };
   };
+  "https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.0/annotations-26.0.0" =
+  {
+    host = repositories.google;
+    path =
+      "com/android/tools/annotations/26.0.0/annotations-26.0.0";
+    type = "jar";
+    pom = {
+      sha1 = "36a4991057a688236cca1b1b55e575bfa979a4e4";
+      sha256 = "14n97s6yw56cyb4xy6mxlr3xah65ayd8wydp7fxh8sg9320172lh";
+    };
+    jar = {
+      sha1 = "fc587b91f1d2390a90d0b02a3e41a0bed140e9c1";
+      sha256 = "0iyqms07qadihcnha4li2gk88x2504w7xvdmichjqc52hsq47kik";
+    };
+  };
   "https://dl.google.com/dl/android/maven2/com/android/tools/annotations/26.0.1/annotations-26.0.1" =
   {
     host = repositories.google;
@@ -1463,6 +1553,21 @@ in {
       sha256 = "08448m7if0fjmq0a7d5cq3ghndmphm28v1n5q6r5ynci93g3fg58";
     };
   };
+  "https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.0/apksig-3.0.0" =
+  {
+    host = repositories.google;
+    path =
+      "com/android/tools/build/apksig/3.0.0/apksig-3.0.0";
+    type = "jar";
+    pom = {
+      sha1 = "23c8d16e6aac3ab71c39e37e860a8ab8cff0979c";
+      sha256 = "1ha5d3bh36q4kj0gh1qmg9ncqwbv2n209mfbfnmwxw4gnj4l9a18";
+    };
+    jar = {
+      sha1 = "21465a36db10551cfcfd8ad39bb496511f78354c";
+      sha256 = "11jc8f5xb3i0mhr2r2sbrajlh26xkgrz4vs5l09sxi77y2iqqz3q";
+    };
+  };
   "https://dl.google.com/dl/android/maven2/com/android/tools/build/apksig/3.0.1/apksig-3.0.1" =
   {
     host = repositories.google;
@@ -1568,6 +1673,21 @@ in {
       sha256 = "0k1qiqk4yj07lmwli1rdn0y3cymlr8xnp9nrv3sqfgvfr1fnbgf0";
     };
   };
+  "https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.0.0/builder-model-3.0.0" =
+  {
+    host = repositories.google;
+    path =
+      "com/android/tools/build/builder-model/3.0.0/builder-model-3.0.0";
+    type = "jar";
+    pom = {
+      sha1 = "770e663a3729b0665f5b73bd2fbd8a196e2cb9ab";
+      sha256 = "0sv1v487fs5z5m131rpmdviqrysh7xdkwj3jga673wdd3phzm6x4";
+    };
+    jar = {
+      sha1 = "a86b254415fded5297e1d849fa1884dfdf62ff42";
+      sha256 = "1fii28knmbd3jxvmp0b06zv403vkwv3pap4s5i180cwc0wl7789p";
+    };
+  };
   "https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-model/3.0.1/builder-model-3.0.1" =
   {
     host = repositories.google;
@@ -1628,6 +1748,21 @@ in {
       sha256 = "1wb2yv4y4qk3g0g5rymzqrv6ngn7xzc4a9qf9lxkg451xxxxlkrp";
     };
   };
+  "https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.0.0/builder-test-api-3.0.0" =
+  {
+    host = repositories.google;
+    path =
+      "com/android/tools/build/builder-test-api/3.0.0/builder-test-api-3.0.0";
+    type = "jar";
+    pom = {
+      sha1 = "a73df0f8a961d459e2b726b41867ffd9dd624952";
+      sha256 = "16vrjm0czd9alch5mghmfp4aldp5xnvfl1pq3xh5hr9x5rvmdc3b";
+    };
+    jar = {
+      sha1 = "9bb354af21d8754ecc9c1c07f80bd85e3a76695f";
+      sha256 = "1kalacq30ydcivyp2pwql59j2xckifv1c6f517ll15pjdxskdnzb";
+    };
+  };
   "https://dl.google.com/dl/android/maven2/com/android/tools/build/builder-test-api/3.0.1/builder-test-api-3.0.1" =
   {
     host = repositories.google;
@@ -1688,6 +1823,21 @@ in {
       sha256 = "093wfl4adllz3gbawakd6nh4ar192k7z1hx2xniff6jdlx9z63l6";
     };
   };
+  "https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0.0/builder-3.0.0" =
+  {
+    host = repositories.google;
+    path =
+      "com/android/tools/build/builder/3.0.0/builder-3.0.0";
+    type = "jar";
+    pom = {
+      sha1 = "8b498ff308f743e8689f528efa56837ac5fdbde6";
+      sha256 = "0a4pal1w33v90cfpd72brb2chqfqmpqs52klg9xigwrkbyjgkp4b";
+    };
+    jar = {
+      sha1 = "36884960f350cb29f1c2c93107f4fa27f4e7444e";
+      sha256 = "07pwrxv5igr4v1886rjdfrrqx4sa5b64yz0p41450qywzm2n880n";
+    };
+  };
   "https://dl.google.com/dl/android/maven2/com/android/tools/build/builder/3.0.1/builder-3.0.1" =
   {
     host = repositories.google;
@@ -1793,6 +1943,21 @@ in {
       sha256 = "153qkzflw3s2k9dyg982v4p0pnrisd5bp47shcak9qy98i6b62s2";
     };
   };
+  "https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.0.0/gradle-api-3.0.0" =
+  {
+    host = repositories.google;
+    path =
+      "com/android/tools/build/gradle-api/3.0.0/gradle-api-3.0.0";
+    type = "jar";
+    pom = {
+      sha1 = "ac9fda7c14cac6f32f55f5083eb4f05c686de023";
+      sha256 = "1f7im02c138frynchbkndrw6lrbc0pyh6vmkx7a99g4jplb1lgmn";
+    };
+    jar = {
+      sha1 = "e98ade5c308a99980d2a61f4ce1d9286df0105e3";
+      sha256 = "1cslx6qiffrq292ka2390yk4jypd3d5f3qx6kwcrr5k6cg1idw24";
+    };
+  };
   "https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-api/3.0.1/gradle-api-3.0.1" =
   {
     host = repositories.google;
@@ -1853,6 +2018,21 @@ in {
       sha256 = "10w0jbigcckap9kpkj7pl47qb3yxlxlp2ybcrryzrlldj6ysag0k";
     };
   };
+  "https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core/3.0.0/gradle-core-3.0.0" =
+  {
+    host = repositories.google;
+    path =
+      "com/android/tools/build/gradle-core/3.0.0/gradle-core-3.0.0";
+    type = "jar";
+    pom = {
+      sha1 = "92aba105dcd9d8fb6e42dbc959affdbcfe5cc136";
+      sha256 = "1h4a1gfr432kxs6r3gpx7hpc4v6xrd4f48rahizmrix2dw2405i5";
+    };
+    jar = {
+      sha1 = "b4b02fa623c5a618e68478d9a4a67e1e87c023c6";
+      sha256 = "1z6yh3aviy8hvrcihz1xnsggrzjp6yd4wipdw03l1l4f2w378x2p";
+    };
+  };
   "https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle-core/3.0.1/gradle-core-3.0.1" =
   {
     host = repositories.google;
@@ -1868,6 +2048,21 @@ in {
       sha256 = "09w0jxh7vkmgy6ing49l8xpyp7jrcz56g2j5sfsyipacdyahyr0a";
     };
   };
+  "https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.0/gradle-3.0.0" =
+  {
+    host = repositories.google;
+    path =
+      "com/android/tools/build/gradle/3.0.0/gradle-3.0.0";
+    type = "jar";
+    pom = {
+      sha1 = "efe9a4c336629561a04b7eafd895054908807cdb";
+      sha256 = "07qm0bfvivx0h2ww7z5sdws78j4gkn75x2hy2mhbhhwq9k20nf4d";
+    };
+    jar = {
+      sha1 = "2356ee8e98b68c53dafc28898e7034080e5c91aa";
+      sha256 = "00ivxwq5rgrx7wfkr8g5z1n21vap9r2vaid9djdqfr9f3jygq8mb";
+    };
+  };
   "https://dl.google.com/dl/android/maven2/com/android/tools/build/gradle/3.0.1/gradle-3.0.1" =
   {
     host = repositories.google;
@@ -2018,6 +2213,21 @@ in {
       sha256 = "1ysf9z2k3mqyv4mm74pphal5n73xya0axn88i6331jvcc3kq3m0x";
     };
   };
+  "https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.0.0/manifest-merger-26.0.0" =
+  {
+    host = repositories.google;
+    path =
+      "com/android/tools/build/manifest-merger/26.0.0/manifest-merger-26.0.0";
+    type = "jar";
+    pom = {
+      sha1 = "2f38803314752b67d1f3ee093b400bb6c5f3b0ee";
+      sha256 = "1s8gfdlhb08cg7g5lxibh9m9pkanyffv4qih488pkn2036pf1256";
+    };
+    jar = {
+      sha1 = "f625bcad5f5dc0cb373e6b62595d64a552a8d073";
+      sha256 = "02bmi5s1vd8n6a38fifhsva0ijqs0c6100k72cl8aa2fcc67dmf9";
+    };
+  };
   "https://dl.google.com/dl/android/maven2/com/android/tools/build/manifest-merger/26.0.1/manifest-merger-26.0.1" =
   {
     host = repositories.google;
@@ -2093,6 +2303,21 @@ in {
       sha256 = "0h2p4b7900j3girbkayq6b92pfw283rqnn74p4nlqlqwbv8a7r2d";
     };
   };
+  "https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.0/common-26.0.0" =
+  {
+    host = repositories.google;
+    path =
+      "com/android/tools/common/26.0.0/common-26.0.0";
+    type = "jar";
+    pom = {
+      sha1 = "f479fa906584db620744108a4a94fe86cbeaad1b";
+      sha256 = "1xklng15h3pfafldlx36zm1w2y7a78nlxi7dxfhfzgqyxxv0bdr6";
+    };
+    jar = {
+      sha1 = "a75e1cbf30e55dd23f73801c32cd565b6eb5fb3f";
+      sha256 = "0701n8yyfya6f931vv5jg5y4fafkhvrciv6pdbj3y3gp0hvmlmi8";
+    };
+  };
   "https://dl.google.com/dl/android/maven2/com/android/tools/common/26.0.1/common-26.0.1" =
   {
     host = repositories.google;
@@ -2153,6 +2378,21 @@ in {
       sha256 = "0kb17bjrlccb7w0yi381baz3l45bvkzsphvy6bmm68075q99byfg";
     };
   };
+  "https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.0/ddmlib-26.0.0" =
+  {
+    host = repositories.google;
+    path =
+      "com/android/tools/ddms/ddmlib/26.0.0/ddmlib-26.0.0";
+    type = "jar";
+    pom = {
+      sha1 = "a8884215b3a37eb3e9a4872b80cd81b58c03e235";
+      sha256 = "125hxfgm6aczic9w6xh1ri13fa1il0rn4dn6727x987wzcp9bj55";
+    };
+    jar = {
+      sha1 = "79daeff3eab3fc4ff963f5717392f1f2476ed788";
+      sha256 = "18smk8glkclb77rrryz416lksswlbvvd357d34di5ggqd0xap7q5";
+    };
+  };
   "https://dl.google.com/dl/android/maven2/com/android/tools/ddms/ddmlib/26.0.1/ddmlib-26.0.1" =
   {
     host = repositories.google;
@@ -2213,6 +2453,21 @@ in {
       sha256 = "0xc8b1vphh9snblnf5xw0v63x42661b5nix3p36rlg0pplsiaxdj";
     };
   };
+  "https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.0/dvlib-26.0.0" =
+  {
+    host = repositories.google;
+    path =
+      "com/android/tools/dvlib/26.0.0/dvlib-26.0.0";
+    type = "jar";
+    pom = {
+      sha1 = "ac0dededfd324bb533f2635fee7778f38874c025";
+      sha256 = "0na1h2kg479ikcxvdrqyxppgsxns4qjh11jlyj6grlnwqcfsv1z2";
+    };
+    jar = {
+      sha1 = "50d8b18ccc5233c4e7ca4c98f9708d44f80ace82";
+      sha256 = "1i37rn56dw92ldsw4qq0la8xjz6hc355675c792grpm2r1gl867m";
+    };
+  };
   "https://dl.google.com/dl/android/maven2/com/android/tools/dvlib/26.0.1/dvlib-26.0.1" =
   {
     host = repositories.google;
@@ -2273,6 +2528,21 @@ in {
       sha256 = "0jnpy9gnapf74s907gs6l6xk65lbbjn2kzz5sggmvp00gdgp9962";
     };
   };
+  "https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/26.0.0/intellij-core-26.0.0" =
+  {
+    host = repositories.google;
+    path =
+      "com/android/tools/external/com-intellij/intellij-core/26.0.0/intellij-core-26.0.0";
+    type = "jar";
+    pom = {
+      sha1 = "ae746b3669aec380b72026deb74b4b0f82cce484";
+      sha256 = "1c3m5sd0pagay1pp1ni0s86q1gz9y5dyc9c6lyw1m211dknrgi7w";
+    };
+    jar = {
+      sha1 = "47396aa1fead8512c246fdf4698552c1f33b1710";
+      sha256 = "1ysyx3hi0m98w9a59jw96n5fkvx9g2zwbl3839qzg1fwrmc8194c";
+    };
+  };
   "https://dl.google.com/dl/android/maven2/com/android/tools/external/com-intellij/intellij-core/26.0.1/intellij-core-26.0.1" =
   {
     host = repositories.google;
@@ -2318,6 +2588,21 @@ in {
       sha256 = "15zh9w56xs6mqz9drxjk6h1518b1x1v1hgpkfpdi6b6sdb85lqbj";
     };
   };
+  "https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/26.0.0/uast-26.0.0" =
+  {
+    host = repositories.google;
+    path =
+      "com/android/tools/external/org-jetbrains/uast/26.0.0/uast-26.0.0";
+    type = "jar";
+    pom = {
+      sha1 = "a905919feddc68e5ebc6f0cddeaf6a2fff8b5195";
+      sha256 = "0q97i1gj5g7f3vfkldn8dyf3f6x962x3ch4gdv7irgh6p9mcs5lb";
+    };
+    jar = {
+      sha1 = "86234f897e27e97c4aebe5686fa0e21139a1fc4e";
+      sha256 = "0wjbfnvhq1himxjj389rlxqr4cqa9ahfkjy74cad1b00mg8yjhgv";
+    };
+  };
   "https://dl.google.com/dl/android/maven2/com/android/tools/external/org-jetbrains/uast/26.0.1/uast-26.0.1" =
   {
     host = repositories.google;
@@ -2348,6 +2633,21 @@ in {
       sha256 = "0d5c01kxqdinjgy7a42g4rc5nvfcqsf4y2gcxd5xfsbk13m0jzww";
     };
   };
+  "https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.0.0/layoutlib-api-26.0.0" =
+  {
+    host = repositories.google;
+    path =
+      "com/android/tools/layoutlib/layoutlib-api/26.0.0/layoutlib-api-26.0.0";
+    type = "jar";
+    pom = {
+      sha1 = "d96e1f06822faea2caceaa5ff82a0f9ed344c07b";
+      sha256 = "0d9ya2bkidfl4i8nwmvzx3vvysw2fpa55m559jdgcy6mpblcngm5";
+    };
+    jar = {
+      sha1 = "2e64aac3c6a6f201df4b7e1c0bd452d8839fb47b";
+      sha256 = "0ayxvqvr18pd7nygrkwyws6vnhscfv2g1a445zqj5zjdgw7rw3id";
+    };
+  };
   "https://dl.google.com/dl/android/maven2/com/android/tools/layoutlib/layoutlib-api/26.0.1/layoutlib-api-26.0.1" =
   {
     host = repositories.google;
@@ -2408,6 +2708,21 @@ in {
       sha256 = "1l1n8l74f391nkppw482rb2lqnpygwsil1p2xhb4w9gwrrc6ss45";
     };
   };
+  "https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.0.0/lint-api-26.0.0" =
+  {
+    host = repositories.google;
+    path =
+      "com/android/tools/lint/lint-api/26.0.0/lint-api-26.0.0";
+    type = "jar";
+    pom = {
+      sha1 = "ae56cef8b3f46c122554ad6befbb0dc9ff359992";
+      sha256 = "0gqdixv8z2add5n30y7hq7hhrchqcmi66jffmdlpadbvn0gsmmwl";
+    };
+    jar = {
+      sha1 = "ba8981e318f342456c77a2420b9d9f0967eaf138";
+      sha256 = "0yy2fw3ircsz38imnwwvhh6si4cc9v3w1a6s2zwacgsvniysvsil";
+    };
+  };
   "https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-api/26.0.1/lint-api-26.0.1" =
   {
     host = repositories.google;
@@ -2438,6 +2753,21 @@ in {
       sha256 = "0f9qx4fy8cnxd5yd5jglkfznhglcnm8lf3afjvyccick7x5d368z";
     };
   };
+  "https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.0.0/lint-checks-26.0.0" =
+  {
+    host = repositories.google;
+    path =
+      "com/android/tools/lint/lint-checks/26.0.0/lint-checks-26.0.0";
+    type = "jar";
+    pom = {
+      sha1 = "02c59a652ac555341479025c928f351201794868";
+      sha256 = "1cvaagg9s0lcyla4fhay31nflcjb6wj6n2qwysnpwiqd4wxba705";
+    };
+    jar = {
+      sha1 = "fe04d508baa247a0d32cafbfd158ca439f875dbd";
+      sha256 = "0gq4h53qx2iy9a343pknbr1zj83k4qs2wrh8gzvl8d10chqjwxd0";
+    };
+  };
   "https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint-checks/26.0.1/lint-checks-26.0.1" =
   {
     host = repositories.google;
@@ -2528,6 +2858,21 @@ in {
       sha256 = "099vnvpqqmlnl3i3zpxg19gls9rfsxr059yw8kckw3m5xww3vm8q";
     };
   };
+  "https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.0/lint-26.0.0" =
+  {
+    host = repositories.google;
+    path =
+      "com/android/tools/lint/lint/26.0.0/lint-26.0.0";
+    type = "jar";
+    pom = {
+      sha1 = "c3b178af06d72d16de1b0e6546026c6ef80d6f09";
+      sha256 = "1n0z0ky9v8qg03k0s7rahb4zi9q6rpl3jr91yzwmv5lp1yfq3h94";
+    };
+    jar = {
+      sha1 = "6c58c8b0066addaaffd174b78d701948b819cf23";
+      sha256 = "07ywh5pg74sw1p60g8wwcdv82azd56h11161r4dzalz300l9g6ll";
+    };
+  };
   "https://dl.google.com/dl/android/maven2/com/android/tools/lint/lint/26.0.1/lint-26.0.1" =
   {
     host = repositories.google;
@@ -2558,6 +2903,21 @@ in {
       sha256 = "1g933660i0yd45bgjw6yn1rqp2svfzbjgcpcbdb9bl4sd452mwn4";
     };
   };
+  "https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.0/repository-26.0.0" =
+  {
+    host = repositories.google;
+    path =
+      "com/android/tools/repository/26.0.0/repository-26.0.0";
+    type = "jar";
+    pom = {
+      sha1 = "bfc1e8e4da7822065f06e8e71f56137535842668";
+      sha256 = "0z8c67369rch3z1mc52ipfk85wsj2kcwlhk4s3jv1pmf31wzyczd";
+    };
+    jar = {
+      sha1 = "7ad3d113c50642163badf3b8d890c6b41b1c6238";
+      sha256 = "0582xlsbbnwl6dzj67yjjjnh5ysiva5pbd10szfvdi4gcnkvn26q";
+    };
+  };
   "https://dl.google.com/dl/android/maven2/com/android/tools/repository/26.0.1/repository-26.0.1" =
   {
     host = repositories.google;
@@ -2618,6 +2978,21 @@ in {
       sha256 = "1vmqkgh3vfhyj6ji74hiccvsp5vai8k2yqn9vp767v7mnk72mj1l";
     };
   };
+  "https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.0/sdk-common-26.0.0" =
+  {
+    host = repositories.google;
+    path =
+      "com/android/tools/sdk-common/26.0.0/sdk-common-26.0.0";
+    type = "jar";
+    pom = {
+      sha1 = "8fd56dc612f1f282fcddf1d2c5b4a8a2c1878bd7";
+      sha256 = "0915xd566szrd7zkmmq3f4swgx9s55qa9ys31dqpfvbqrpb361ap";
+    };
+    jar = {
+      sha1 = "3cf21b0652068a57852663610e8c7f0a044dc700";
+      sha256 = "1f33bn2f8y83s02nzmw124lm217bj82kp8m516r69z1k3wz9nb67";
+    };
+  };
   "https://dl.google.com/dl/android/maven2/com/android/tools/sdk-common/26.0.1/sdk-common-26.0.1" =
   {
     host = repositories.google;
@@ -2678,6 +3053,21 @@ in {
       sha256 = "0yq803xfl7pbqv8qndr54mwqa37qdgvph1pkr0c0lmczjgf70sjj";
     };
   };
+  "https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.0/sdklib-26.0.0" =
+  {
+    host = repositories.google;
+    path =
+      "com/android/tools/sdklib/26.0.0/sdklib-26.0.0";
+    type = "jar";
+    pom = {
+      sha1 = "4f9acbbb89224b1731deb41d5add787c304e2097";
+      sha256 = "1zmpmzaqh4124kh4py51s12ddgpw5dx35spiq1lxv8946kn4m62v";
+    };
+    jar = {
+      sha1 = "5bc6118beed3c516fba2057e5feea3af932c1e22";
+      sha256 = "1jyh2zzy1mnp3692c6v2lahm75wv2d87iwm9bq2rnsip3pjhzhwv";
+    };
+  };
   "https://dl.google.com/dl/android/maven2/com/android/tools/sdklib/26.0.1/sdklib-26.0.1" =
   {
     host = repositories.google;

nix/mobile/android/targets/release-android.nix

@@ -44,20 +44,13 @@ in stdenv.mkDerivation {
       filter =
         # Keep this filter as restrictive as possible in order to avoid unnecessary rebuilds and limit closure size
         mkFilter {
-          dirRootsToInclude = [
-            "mobile/js_files"
-            "modules/react-native-status/android"
-            "resources"
-          ];
-          dirsToExclude = [
-            ".git" ".svn" "CVS" ".hg" ".gradle"
-            "build" "intermediates" "libs" "obj"
-          ];
-          filesToInclude = [
+          root = path;
+          include = [
+            "mobile/js_files.*" "resources/.*"
+            "modules/react-native-status/android.*"
             envFileName "VERSION" ".watchmanconfig"
             "status-go-version.json" "react-native.config.js"
           ];
-          root = path;
         };
     };
   nativeBuildInputs = [ bash gradle unzip ] ++ lib.optionals stdenv.isDarwin [ file gnumake patchedWatchman ];
@@ -127,6 +120,9 @@ in stdenv.mkDerivation {
     ${androidEnvShellHook}
     ${concatStrings (catAttrs "shellHook" [ mavenAndNpmDeps.shell status-go.shell ])}
 
+    # fix permissions so gradle can create directories
+    chmod -R +w $sourceRoot/android
+
     pushd $sourceRoot/android
     ${adhocEnvVars} ./gradlew -PversionCode=${assert build-number != ""; build-number} assemble${capitalizedBuildType} || exit
     popd > /dev/null

nix/mobile/default.nix

@@ -5,7 +5,7 @@ let
   inherit (lib) catAttrs concatStrings optional unique;
 
   xcodewrapperArgs = {
-    version = "11.3.1";
+    version = "11.4.1";
   };
   xcodeWrapper = composeXcodeWrapper xcodewrapperArgs;
   fastlane = callPackage ./fastlane { };

nix/mobile/ios/default.nix

@@ -12,15 +12,16 @@ let
 
   src =
     let path = ./../../..;
-    in builtins.path { # We use builtins.path so that we can name the resulting derivation, otherwise the name would be taken from the checkout directory, which is outside of our control
+    # We use builtins.path so that we can name the resulting derivation,
+    # otherwise the name would be taken from the checkout directory, which is outside of our control
+    in builtins.path {
       inherit path;
       name = "status-react-source-npm-deps";
       filter =
-        # Keep this filter as restrictive as possible in order to avoid unnecessary rebuilds and limit closure size
+        # Keep this filter as restrictive as possible in order to avoid 
+        # unnecessary rebuilds and limit closure size
         mkFilter {
-          dirRootsToInclude = [ "mobile/js_files" ];
-          dirsToExclude = [ ".git" ".svn" "CVS" ".hg" ];
-          filesToInclude = [ ".babelrc" ];
+          include = [ ".babelrc" "mobile/js_files.*" ];
           root = path;
         };
     };

nix/scripts/clean.sh

@@ -89,7 +89,7 @@ if [[ -n "${nixResultPath}" ]]; then
     toDelete=$(findByResult "${nixResultPath}")
 else 
     # use regular expression that should match all status-react build artifacts
-    toDelete=$(findByRegex '.*-status-react-(shell|source|build|patched-npm-gradle-modules).*')
+    toDelete=$(findByRegex '.*-status-(react|go)-(shell|source|build|patched-npm-gradle-modules).*')
 fi
 
 # remove duplicates and return

nix/status-go/default.nix

@@ -32,10 +32,13 @@ let
             filter =
               # Keep this filter as restrictive as possible in order to avoid unnecessary rebuilds and limit closure size
               mkFilter {
-                dirRootsToInclude = [];
-                dirsToExclude = [ ".git" ".svn" "CVS" ".hg" ".vscode" ".dependabot" ".github" ".ethereumtest" "build" ];
-                filesToInclude = [ "Makefile" "go.mod" "go.sum" "VERSION" ];
                 root = path;
+                include = [ ".*" ];
+                exclude = [
+                  ".*/[.]git.*" ".*[.]md" ".*[.]yml"
+                  ".*/.*_test.go$" "_assets/.*" "build/.*"
+                  ".*/.*LICENSE.*" ".*/CONTRIB.*" ".*/AUTHOR.*"
+                ];
               };
           };
     } else

nix/status-go/nimbus/default.nix

@@ -12,10 +12,11 @@ let
     filter =
       # Keep this filter as restrictive as possible in order to avoid unnecessary rebuilds and limit closure size
       mkFilter {
-        dirRootsToInclude = [ "nix" "wrappers" "vendor" ];
-        dirsToExclude = [ ".git" ".svn" "CVS" ".hg" ".vscode" ".dependabot" ".github" "examples" "docs" ];
-        filesToInclude = [ "Makefile" "nim.cfg" "nimbus.nimble" "default.nix" ];
         root = path;
+        include = [
+          "nix.*" "wrappers.*" "vendor.*"
+          "Makefile" "nim.cfg" "nimbus.nimble" "default.nix"
+        ];
       };
   };
 

nix/tools/mkFilter.nix

@@ -1,44 +1,62 @@
 { lib }:
 
-# This Nix expression allows filtering a local directory by specifying dirRootsToInclude, dirsToExclude and filesToInclude.
-# It also filters out symlinks to result folders created by nix-build, as well as backup/swap/generated files
+# This Nix expression allows filtering a local directory by
+# specifying dirRootsToInclude, dirsToExclude and filesToInclude.
+# It also filters out symlinks to result folders created by nix-build,
+# as well as backup/swap/generated files.
 
 let
   inherit (lib)
-    any compare compareLists elem elemAt hasPrefix length min splitString take;
-
-  isPathAllowed = allowedPath: path:
-    let
-      count = min (length allowedPathElements) (length pathElements);
-      pathElements = splitString "/" path;
-      allowedPathElements = splitString "/" allowedPath;
-      pathElementsSubset = take count pathElements;
-      allowedPathElementsSubset = take count allowedPathElements;
-    in (compareLists compare allowedPathElementsSubset pathElementsSubset) == 0;
+    any range flatten length sublist cleanSourceFilter 
+    splitString hasPrefix removePrefix concatStringsSep;
+  inherit (builtins) map match;
 
   mkFilter = {
-    dirRootsToInclude, # Relative paths of directories to include
-    dirsToExclude ? [ ], # Base names of directories to exclude
-    filesToInclude ? [ ], # Relative path of files to include
-    filesToExclude ? [ ], # Relative path of files to exclude
-    root }:
+    # primary path under which all files are included, unless excluded
+    root,
+    # list of regex expressions to match files to include/exclude
+    include ? [ ],
+    exclude ? [ ], # has precedence over include
+    # by default we ignore Version Control System files
+    ignoreVCS ? true,
+  }:
     let
-      allPathRootsAllowed = (length dirRootsToInclude) == 0;
-      # this removes superfluous slashes from the path
+      # removes superfluous slashes from the path
       cleanRoot = "${toString (/. + root)}/";
-    in
-      path: type:
-      let
-        baseName = baseNameOf (toString path);
-        subpath = elemAt (splitString cleanRoot path) 1;
-        spdir = elemAt (splitString "/" subpath) 0;
+    in path: type:
+    let
+      # unpack path: "x/y/.*" => ["x" "x/y" "x/y/.*"]
+      unpackPath = path:
+        let
+          tokens = splitString "/" path;
+          perms = range 1 (length tokens);
+          subPaths = builtins.map (x: sublist 0 x tokens) perms;
+        in builtins.map (x: concatStringsSep "/" x) subPaths;
+      # accept subdirs from regexes
+      includeSubdirs = regexes: flatten (map unpackPath regexes);
+      # checks all regexes in a list against str
+      matchesRegexes = str: regexes: (map (r: (match r str)) regexes);
+      # match returns empty list on match
+      isMatch = x: x == [ ];
+      # path relative to search root
+      relPath = removePrefix cleanRoot path;
+      # check if any of the regexes match the relative path
+      checkRegexes = regexes: any isMatch (matchesRegexes relPath regexes);
 
-      in lib.cleanSourceFilter path type && (
-        (type != "directory" && (elem spdir filesToInclude) && !(elem spdir filesToExclude)) ||
-        # check if any part of the directory path is described in dirRootsToInclude
-        ((allPathRootsAllowed || (any (dirRootToInclude: isPathAllowed dirRootToInclude subpath) dirRootsToInclude)) && ! (
-          # Filter out version control software files/directories
-          (type == "directory" && (elem baseName dirsToExclude))
-      )));
+      # main check methods
+      isRootSubdir = hasPrefix cleanRoot path;
+      isIncluded = checkRegexes (includeSubdirs include);
+      isExcluded = checkRegexes exclude;
+      isVCS = ignoreVCS && !cleanSourceFilter path type;
+
+    in
+      if !isRootSubdir then
+        # everything outside of root is excluded
+        false
+      else if isExcluded || isVCS then
+        # isExcluded has precedence over isIncluded
+        false
+      else
+        isIncluded;
 
 in mkFilter

nix/tools/mkFilter_test.nix

@@ -1,56 +1,66 @@
 # This file is an example of the syntax required to call a Nix function
 # and serves to test mkFilter.nix.
 # 
-# nix-instantiate --strict --json --eval ./mkFilter_test.nix
+# nix-instantiate --strict --json --eval ./mkFilter_test.nix | jq
 # [
 #   {
-#     "expected": true,
-#     "path": "/home/pedro/src/github.com/status-im/status-react/android/1",
-#     "result": true
+#     "pass": true,
+#     "path": "/ABS/PATH/android/subdir",
 #   },
 #   {
-#     "expected": true,
-#     "path": "/home/pedro/src/github.com/status-im/status-react/ios",
-#     "result": false
+#     "pass": true,
+#     "path": "/ABS/PATH/ios",
 #   }
+#   ...
 # ]
 
-{ pkgs ? import <nixpkgs> { },
-  lib ? pkgs.stdenv.lib }:
-
 let
+  pkgs = import <nixpkgs> { };
+  lib = pkgs.stdenv.lib;
   mkFilter = pkgs.callPackage ./mkFilter.nix { inherit lib; };
-  absPath = "/ABS/PROJECT/PATH";
+  absPath = "/ABS/PATH";
   filter = mkFilter {
-    dirRootsToInclude = [ "android" ];
-    # dirsToExclude ? [],  # Base names of directories to exclude
-    # filesToInclude ? [], # Relative path of files to include
-    # filesToExclude ? [], # Relative path of files to exclude
     root = absPath;
+    include = [ "android" ".*included.*" "sub/folder/.*" ];
+    exclude = [ ".*excluded.*" ];
   };
   tests = [
-    {
-      a = {
-        path = "${absPath}/android/1";
-        type = "directory";
-      };
-      e = true;
-    }
-    {
-      a = {
-        path = "${absPath}/ios";
-        type = "directory";
-      };
-      e = false;
-    }
+    { path = "/WRONG/ABS/PATH"; type = "directory";
+      expected = false; }
+    { path = "${absPath}/.git"; type = "directory";
+      expected = false; }
+    { path = "${absPath}/included"; type = "file";
+      expected = true; }
+    { path = "${absPath}/android/included"; type = "directory";
+      expected = true; }
+    { path = "${absPath}/sub"; type = "file";
+      expected = true; }
+    { path = "${absPath}/sub/folder"; type = "file";
+      expected = true; }
+    { path = "${absPath}/sub/folder/file"; type = "file";
+      expected = true; }
+    { path = "${absPath}/sub/folder/xyz/file"; type = "file";
+      expected = true; }
+    { path = "${absPath}/android/sub/included"; type = "directory";
+      expected = true; }
+    { path = "${absPath}/android/included/excluded"; type = "directory";
+      expected = false; }
+    { path = "${absPath}/android/excluded"; type = "directory";
+      expected = false; }
+    { path = "${absPath}/ios/included"; type = "directory";
+      expected = true; }
+    { path = "${absPath}/ios/subfile"; type = "file";
+      expected = false; }
   ];
-  boolToString = b: if b then "true" else "false";
-
+  # make paths absolute
+  testsAbs = builtins.map (
+    t: t // { path = "${absPath}/${t.path}"; }
+  ) tests;
 in builtins.map (
     t: let
-      rval = (filter t.a.path t.a.type);
+      rval = (filter t.path t.type);
     in {
-      path = t.a.path;
-      pass = t.e == rval;
+      path = t.path;
+      pass = t.expected == rval;
     }
   ) tests

prod/status_im/i18n_resources.cljs

@@ -5,69 +5,39 @@
 (def default-device-language
   (keyword (.-language rn-dependencies/react-native-languages)))
 
-(def languages [:af :ar :bel :cs :da :de :de_ch :el :en :es :es_419 :es_ar :es_mx :fa :fi :fr :fr_ch :fy :he :hi :hu :id :it_ch :ja :ko :la :lt :lv :ms :nb :ne :nl :pl :pt_br :pt_pt :ro :ru :sl :sr_rs_cyrl :sr_rs :latn :sv :sw :th :tr :uk :ur :vi :zh])
+(def languages [:ar :en :es :es_419 :fil :fr :id :in :it :ko :ru :zh :zh_Hant :zh_TW])
 
 (defonce loaded-languages
   (atom
    (conj #{:en} default-device-language)))
 
    (def prod-translations
-     {:af         (js/require "status-modules/translations/af.json")
+     {
       :ar         (js/require "status-modules/translations/ar.json")
-      :bel        (js/require "status-modules/translations/bel.json")
-      :cs         (js/require "status-modules/translations/cs.json")
-      :da         (js/require "status-modules/translations/da.json")
-      :de         (js/require "status-modules/translations/de.json")
-      :de_ch      (js/require "status-modules/translations/de_ch.json")
-      :el         (js/require "status-modules/translations/el.json")
       :en         (js/require "status-modules/translations/en.json")
       :es         (js/require "status-modules/translations/es.json")
       :es_419     (js/require "status-modules/translations/es_419.json")
-      :es_ar      (js/require "status-modules/translations/es_ar.json")
-      :es_mx      (js/require "status-modules/translations/es_mx.json")
-      :fa         (js/require "status-modules/translations/fa.json")
-      :fi         (js/require "status-modules/translations/fi.json")
+      :fil        (js/require "status-modules/translations/fil.json")
       :fr         (js/require "status-modules/translations/fr.json")
-      :fr_ch      (js/require "status-modules/translations/fr_ch.json")
-      :fy         (js/require "status-modules/translations/fy.json")
-      :he         (js/require "status-modules/translations/he.json")
-      :hi         (js/require "status-modules/translations/hi.json")
-      :hu         (js/require "status-modules/translations/hu.json")
       :id         (js/require "status-modules/translations/id.json")
+      :in         (js/require "status-modules/translations/id.json")
       :it         (js/require "status-modules/translations/it.json")
-      :it_ch      (js/require "status-modules/translations/it_ch.json")
-      :ja         (js/require "status-modules/translations/ja.json")
       :ko         (js/require "status-modules/translations/ko.json")
-      :la         (js/require "status-modules/translations/la.json")
-      :lt         (js/require "status-modules/translations/lt.json")
-      :lv         (js/require "status-modules/translations/lv.json")
-      :ms         (js/require "status-modules/translations/ms.json")
-      :nb         (js/require "status-modules/translations/nb.json")
-      :ne         (js/require "status-modules/translations/ne.json")
-      :nl         (js/require "status-modules/translations/nl.json")
-      :pl         (js/require "status-modules/translations/pl.json")
-      :pt_br      (js/require "status-modules/translations/pt_br.json")
-      :pt_pt      (js/require "status-modules/translations/pt_pt.json")
-      :ro         (js/require "status-modules/translations/ro.json")
       :ru         (js/require "status-modules/translations/ru.json")
-      :sl         (js/require "status-modules/translations/sl.json")
-      :sr_rs_cyrl (js/require "status-modules/translations/sr_rs_cyrl.json")
-      :sr_rs_latn (js/require "status-modules/translations/sr_rs_latn.json")
-      :sv         (js/require "status-modules/translations/sv.json")
-      :sw         (js/require "status-modules/translations/sw.json")
-      :th         (js/require "status-modules/translations/th.json")
-      :tr         (js/require "status-modules/translations/tr.json")
-      :uk         (js/require "status-modules/translations/uk.json")
-      :ur         (js/require "status-modules/translations/ur.json")
-      :vi         (js/require "status-modules/translations/vi.json")
-      :zh         (js/require "status-modules/translations/zh.json")})
+      :zh         (js/require "status-modules/translations/zh.json")
+      :zh_Hant    (js/require "status-modules/translations/zh_TW.json")
+      :zh_TW      (js/require "status-modules/translations/zh_TW.json")})
 
 (defn valid-language [lang]
   (if (contains? prod-translations lang)
     lang
-    (let [short-lang (keyword (subs (name lang) 0 2))]
-      (when (contains? prod-translations short-lang)
-        short-lang))))
+    (let [parts (string/split (name lang) #"_")
+          short-lang (keyword (str (first parts) "_" (second parts)))
+          shortest-lang (keyword (first parts))]
+      (if (and (> (count parts) 2) (contains? prod-translations short-lang))
+        short-lang
+        (when (contains? prod-translations shortest-lang)
+          shortest-lang)))))
 
 (defn require-translation [lang-key]
   (when-let [lang (valid-language lang-key)]

react-native.config.js

@@ -22,10 +22,5 @@ module.exports = {
                 ios: null,
             },
         },
-        'react-native-webview-bridge': {
-            platforms: {
-                android: null,
-            },
-        },
     },
 };

react-native/src/desktop/status_im/react_native/js_dependencies.cljs

@@ -38,3 +38,4 @@
 (def async-storage          #js {})
 (def back-handler           #js {:addEventListener (fn [])})
 (def safe-area-context      #js {})
+(def react-native-dark-mode #js {})

react-native/src/mobile/status_im/react_native/js_dependencies.cljs

@@ -7,10 +7,9 @@
 (def react                  (js/require "react"))
 (def react-native           (js/require "react-native"))
 (def status-keycard         (js/require "react-native-status-keycard"))
-(def webview-bridge         (js/require "react-native-webview-bridge"))
+(def webview                (js/require "react-native-webview"))
 (def touchid-class          (js/require "react-native-touch-id"))
 (def touchid                (.-default touchid-class))
-;(defn webview []            (js/require "react-native-webview"))
 (def EventEmmiter           (js/require "react-native/Libraries/vendor/emitter/EventEmitter"))
 (def fetch-polyfill         (js/require "react-native-fetch-polyfill"))
 (def fetch                  (.-default fetch-polyfill))
@@ -39,7 +38,14 @@
 (def desktop-config         #js {:addEventListener (fn [])})
 (def desktop-shortcuts      #js {:addEventListener (fn [])})
 (def safe-area-context      (js/require "react-native-safe-area-context"))
+(def react-native-dark-mode (js/require "react-native-dark-mode"))
 
 (def react-navigation-native      (js/require "@react-navigation/native"))
 (def react-navigation-stack       (js/require "@react-navigation/stack"))
 (def react-navigation-bottom-tabs (js/require "@react-navigation/bottom-tabs"))
+
+(def react-native-haptic-feedback (js/require "react-native-haptic-feedback"))
+
+(def react-native-reanimated (js/require "react-native-reanimated"))
+(def react-native-redash (js/require "react-native-redash"))
+(def react-native-gesture-handler (js/require "react-native-gesture-handler"))