again some more fixing id700747

* bump status-go version to 0.97.2 (#13215)
https://github.com/status-im/status-go/compare/a3c60528ef6e077761a9beb7dd9c530123b7315f...e4acca1cc540b196f52f0bead9d3be2630440275

* bump status-go version to 0.97.3

.carve_ignore

@@ -1,6 +1,5 @@
 status-im.utils.build/warning-handler
 status-im.utils.build/get-current-sha
-status-im.ethereum.resolver/name
 status-im.chat.constants/spacing-char
 status-im.chat.constants/arg-wrapping-char
 status-im.ios.core/init

.env

@@ -32,3 +32,5 @@ METRICS_ENABLED=0
 DELETE_MESSAGE_ENABLED=1
 COLLECTIBLES_ENABLED=1
 COMMANDS_ENABLED=1
+TWO_MINUTES_SYNCING=1
+SWAP_ENABLED=1

.env.e2e

@@ -33,3 +33,4 @@ COMMUNITIES_ENABLED=1
 COMMUNITIES_MANAGEMENT_ENABLED=1
 METRICS_ENABLED=0
 DELETE_MESSAGE_ENABLED=1
+TWO_MINUTES_SYNCING=1

.env.jenkins

@@ -35,3 +35,5 @@ COMMUNITIES_ENABLED=1
 COMMUNITIES_MANAGEMENT_ENABLED=1
 METRICS_ENABLED=0
 DELETE_MESSAGE_ENABLED=1
+TWO_MINUTES_SYNCING=1
+ENABLE_QUO_PREVIEW=1

.github/ISSUE_TEMPLATE/release-issue.md

@@ -27,11 +27,11 @@ Upgrade (e2e):
 ### Process
 #### 1) Kick-off
 - [ ] 1. Translation PRs is merged before cutting branch (Jinho)
-- [ ] 2. Prepare scope of visible changes based on commits history, started from previous release branch cut ([example]( https://notes.status.im/1.14-release-notes?view))
+- [ ] 2. Prepare scope of visible changes based on commits history, started from previous release branch cut ([guide](https://notes.status.im/how-to-prepare-release-notes))
 - [ ] 3. Update [RELEASES.md](https://github.com/status-im/status-react/blob/develop/RELEASES.md) with release notes (make PR based on previous step)
 - [ ] 4. Create release branch using this [guide](https://github.com/status-im/status-react/blob/develop/doc/RELEASE_GUIDE.md), bump VERSION (merge created PR ([example](https://github.com/status-im/status-react/pull/12504) ) to develop) and get successful release builds (so, testing can be started)
 - [ ] 5. Based on release scope, ask for comms (Jonny) 
-- [ ] 6. Make sure that assets (screenshots, video) in stores are up to date. If should be updated, ask @cammellos  for help
+- [ ] 6. Make sure that assets (screenshots, video) in stores are up-to-date, more info [here](https://notes.status.im/how-to-update-assets)
 
 #### 2) Testing
 [comment]: # (Section will be maintained by QA)
@@ -53,14 +53,15 @@ Upgrade (e2e):
 
 #### 3) Submission
 
-- [ ] 1. Release notes written and added (500 character limit for updates (Android) and PR for [RELEASES.md](https://github.com/status-im/status-react/blob/develop/RELEASES.md) is ready to be merged (from 1.3 step)
-- [ ] 2. Submit beta version for Android (Open Testing in Play Store)
-- [ ] 3. Submit iOS build to Apple review ([instruction](https://drive.google.com/file/d/10Cl7PBB7TFPkZiVbfzdFGpfMRP9bxXuq/view?usp=sharing), be careful - low quality of audio)
-- [ ] 4. Play store content reviewed and updated
-- [ ] 5. Privacy policy reviewed and updated (ask in channel)
-- [ ] 6. Countries to be excluded (ask in channel) 
-- [ ] 7. Changes to our FAQ made (should be checked and if any changes needed, ask Jakub to made them)
-- [ ] 8. Prepare PR for F-droid build ([instruction]( https://github.com/status-im/status-react/blob/develop/doc/FDROID.md))
+- [ ] 1. Prepare PR for F-droid build ([instruction]( https://github.com/status-im/status-react/blob/develop/doc/FDROID.md))
+- [ ] 2. Release notes written and added (500 character limit for updates (Android) and PR for [RELEASES.md](https://github.com/status-im/status-react/blob/develop/RELEASES.md) is ready to be merged (from 1.3 step)
+- [ ] 3. Submit beta version for Android (Open Testing in Play Store)
+- [ ] 4. Submit iOS build to Apple review ([instruction](https://drive.google.com/file/d/10Cl7PBB7TFPkZiVbfzdFGpfMRP9bxXuq/view?usp=sharing), be careful - low quality of audio)
+- [ ] 5. Play store content reviewed and updated
+- [ ] 6. Privacy policy reviewed and updated (ask in channel)
+- [ ] 7. Countries to be excluded (ask in channel) 
+- [ ] 8. Changes to our FAQ made (should be checked and if any changes needed, ask Jakub to made them)
+
 
 #### 4) Before publishing
 - [ ] 1. Translations for comms available (marketing, ask in the channel)

.github/github-bot.yml

@@ -10,7 +10,7 @@ project-board:
 
 automated-tests:
   repo-full-name: 'status-im/status-react'
-  job-full-name: 'end-to-end-tests/status-app-prs'
+  job-full-name: 'status-react/e2e/status-app-prs'
   kickoff-column-name: 'E2E Tests'
 
 github-team:

.gitignore

@@ -168,4 +168,5 @@ project.clj
 
 ##appium
 test/appium/report/
-result.xml
+result.xml
+test/appium/tests/users.py

Makefile

@@ -1,4 +1,4 @@
-.PHONY: nix-add-gcroots clean nix-clean run-metro test release _list _fix-node-perms _tmpdir-mk _tmpdir-rm
+.PHONY: nix-add-gcroots clean nix-clean run-metro test release _list _fix-node-perms _tmpdir-mk _tmpdir-rm _install-hooks
 
 help: SHELL := /bin/sh
 help: ##@other Show this help
@@ -124,6 +124,11 @@ _tmpdir-rm: SHELL := /bin/sh
 _tmpdir-rm: ##@prepare Remove TMPDIR
 	rm -fr "$(TMPDIR)"
 
+_install-hooks: SHELL := /bin/sh
+_install-hooks: ##@prepare Create prepare-commit-msg git hook symlink
+	@ln -s -f ../../scripts/hooks/prepare-commit-msg .git/hooks
+-include _install-hooks
+
 # Remove directories and ignored files
 clean: SHELL := /bin/sh
 clean: _fix-node-perms _tmpdir-rm ##@prepare Remove all output folders
@@ -200,8 +205,9 @@ release-fdroid: export BUILD_TYPE = release
 release-fdroid: export ANDROID_APK_SIGNED = false
 release-fdroid: export ANDROID_ABI_SPLIT = false
 release-fdroid: export ANDROID_ABI_INCLUDE = armeabi-v7a;arm64-v8a;x86;x86_64
+release-fdroid: export READER_FEATURES = google-free
 release-fdroid: ##@build Build release for F-Droid
-	sed -i -e '$$aGOOGLE_FREE=1' .env.release
+	scripts/google-free.sh
 	scripts/release-android.sh
 
 release-ios: export TARGET := ios

VERSION

@@ -1 +1 @@
-1.18.0
+1.19.0

android/app/build.gradle

@@ -126,7 +126,7 @@ def enableHermes = project.ext.react.get("enableHermes", false);
 /**
  * Exclude google library so we can publish to external android stores
  */
-def googleFree = project.env.get("GOOGLE_FREE", false)
+def googleFree = project.env.get("GOOGLE_FREE", 0) == '1'
 
 def getCommitHash = { ->
     if (project.hasProperty("commitHash")) {
@@ -341,6 +341,8 @@ dependencies {
             exclude group: 'com.google.android.gms'
             exclude group: 'com.android.installreferrer'
         }
+    } else {
+	implementation 'com.google.firebase:firebase-messaging:23.0.0'
     }
 
     // react-native-screens
@@ -358,6 +360,7 @@ dependencies {
     implementation 'com.github.status-im:function:0.0.1'
     implementation 'com.facebook.fresco:fresco:2.2.0'
     implementation 'com.facebook.fresco:animated-gif:2.2.0'
+    implementation "com.squareup.okhttp3:okhttp-tls:3.12.12"
 }
 
 def getLocalNDKDir = { ->
@@ -393,3 +396,7 @@ task hemroidBuild(type: Exec) {
 preBuild.dependsOn hemroidBuild
 
 apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
+
+if (!googleFree) {
+	apply plugin: "com.google.gms.google-services"
+}

android/app/google-services.json

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

android/app/src/main/AndroidManifest.xml

@@ -81,6 +81,12 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/file_provider_paths" />
         </provider>
+	<meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@drawable/notification_icon" />
+	<meta-data
+            android:name="com.google.firebase.messaging.default_notification_color"
+            android:resource="@color/notification_icon_color" />
     </application>
 
 </manifest>

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

@@ -15,12 +15,14 @@ import com.reactnativenavigation.NavigationApplication;
 import com.reactnativenavigation.react.NavigationReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.ReactInstanceManager;
+import com.facebook.react.modules.network.OkHttpClientProvider;
 
 import java.util.List;
 
 import im.status.ethereum.keycard.RNStatusKeycardPackage;
 import im.status.ethereum.module.StatusPackage;
 import im.status.ethereum.pushnotifications.PushNotificationPackage;
+import im.status.ethereum.StatusOkHttpClientFactory;
 
 public class MainApplication extends NavigationApplication {
 
@@ -56,7 +58,9 @@ public class MainApplication extends NavigationApplication {
     @Override
     public void onCreate() {
         super.onCreate();
-        
+
+        OkHttpClientProvider.setOkHttpClientFactory(new StatusOkHttpClientFactory());
+
         WebView.setWebContentsDebuggingEnabled(BuildConfig.DEBUG_WEBVIEW == "1");
         initializeFlipper(this, getReactNativeHost().getReactInstanceManager());
     }

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

@@ -0,0 +1,44 @@
+package im.status.ethereum;
+
+import android.util.Log;
+
+import com.facebook.react.modules.network.OkHttpClientFactory;
+import com.facebook.react.modules.network.OkHttpClientProvider;
+
+import okhttp3.OkHttpClient;
+import okhttp3.Interceptor;
+import okhttp3.tls.HandshakeCertificates;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.lang.RuntimeException;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+
+import im.status.ethereum.module.StatusPackage;
+
+class StatusOkHttpClientFactory implements OkHttpClientFactory {
+  public OkHttpClient createNewNetworkModuleClient() {
+    String certPem = StatusPackage.getImageTLSCert();
+    X509Certificate cert;
+
+    try {
+      CertificateFactory cf = CertificateFactory.getInstance("X.509");
+      cert = (X509Certificate) cf.generateCertificate(new ByteArrayInputStream(certPem.getBytes()));
+    } catch(Exception e) {
+      Log.e("StatusOkHttpClientFactory", "Could not parse certificate");
+      cert = null;
+    }
+
+    HandshakeCertificates clientCertificates = new HandshakeCertificates.Builder()
+      .addPlatformTrustedCertificates()
+      .addTrustedCertificate(cert)
+      .build();
+
+    return OkHttpClientProvider.createClientBuilder()
+      .sslSocketFactory(clientCertificates.sslSocketFactory(), clientCertificates.trustManager())
+      .build();
+  }
+}

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

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

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="alert_background">#ffffff</color>
+  <color name="alert_text">#000000</color>
+  <color name="notification_icon_color">#4360DF</color>
+</resources>

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

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

android/build.gradle

@@ -22,6 +22,7 @@ buildscript {
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31"
         classpath "com.android.tools.build:gradle:${project.ext.gradlePluginVersion}"
+	classpath "com.google.gms:google-services:4.3.10"
         // WARNING: Do not place your application dependencies here!
         //          They belong in the individual module build.gradle files.
     }

ci/Jenkinsfile.android

@@ -1,7 +1,7 @@
-library 'status-jenkins-lib@v1.3.3'
+library 'status-jenkins-lib@v1.3.5'
 
 pipeline {
-  agent { label 'linux' }
+  agent { label 'linux && x86_64 && nix-2.3' }
 
   options {
     timestamps()

ci/Jenkinsfile.combined

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.3.3'
+library 'status-jenkins-lib@v1.3.5'
 
 pipeline {
   agent { label 'linux' }
@@ -101,7 +101,7 @@ pipeline {
       steps { script {
         e2eApk = utils.getEnv(apke2e, 'SAUCE_URL')
         build(
-          job: 'end-to-end-tests/status-app-nightly',
+          job: 'status-react/e2e/status-app-nightly',
           parameters: [string(name: 'APK_NAME', value: e2eApk)],
           wait: false
         )

ci/Jenkinsfile.ios

@@ -1,7 +1,7 @@
-library 'status-jenkins-lib@v1.3.3'
+library 'status-jenkins-lib@v1.3.5'
 
 pipeline {
-  agent { label 'macos && x86_64 && xcode-12.5' }
+  agent { label 'macos && x86_64 && nix-2.3 && xcode-12.5' }
 
   parameters {
     string(

ci/Jenkinsfile.nix-cache

@@ -1,4 +1,4 @@
-library 'status-jenkins-lib@v1.3.3'
+library 'status-jenkins-lib@v1.3.5'
 
 pipeline {
   agent { label params.AGENT_LABEL }

ci/tests/Jenkinsfile.e2e-nightly

@@ -3,15 +3,15 @@ pipeline {
   agent { label 'linux' }
 
   parameters {
-    string(
-      name: 'NETWORK',
-      description: 'Name of test network to use.',
-      defaultValue: 'ropsten',
-    )
     string(
       name: 'APK_NAME',
       description: 'Filename of APK uploaded to SauceLabs.',
     )
+    string(
+      name: 'KEYWORD_EXPRESSION',
+      description: 'This will run tests which contain names that match the given string expression  (Optional)',
+      defaultValue: '',
+    )
   }
 
   options {
@@ -48,16 +48,22 @@ pipeline {
             credentialsId: 'infura-e2e-token',
             variable: 'WEB3_INFURA_PROJECT_ID'
           ),
+          file(
+            credentialsId: "mobile-tests-eth-accounts",
+            variable: 'TEST_ETH_ACCOUNTS_FILE'
+          ),
         ]) {
           dir('test/appium/tests') {
+            /* Provide Eth test accounts secrets. */
+            sh 'cp -f $TEST_ETH_ACCOUNTS_FILE users.py'
             sh """
               python3 -m pytest \
                 --numprocesses 15 \
                 --rerun_count=2 \
                 --testrail_report=True \
                 -m testrail_id \
-                -m "not upgrade" \
-                --network=${params.NETWORK} \
+                -m \"not upgrade\" \
+                -k \"${params.KEYWORD_EXPRESSION}\" \
                 --apk=${params.APK_NAME}
             """
           }

ci/tests/Jenkinsfile.e2e-prs

@@ -8,16 +8,12 @@ pipeline {
       description: 'Name of the branch to checkout and build.',
       defaultValue: 'develop',
     )
-    string(
-      name: 'NETWORK',
-      description: 'Name of test network to use.',
-      defaultValue: 'ropsten',
-    )
+/* Commented to use TEST_MARKERS values from job params
     string(
       name: 'TEST_MARKERS',
       description: 'Marker expression for matching tests to run.',
       defaultValue: 'critical or high',
-    )
+    ) */
     string(
       name: 'APK_NAME',
       description: 'Filename of APK uploaded to SauceLabs, path, or URL.',
@@ -26,9 +22,14 @@ pipeline {
       name: 'PR_ID',
       description: 'ID of the Pull Request triggering this build.',
     )
+    string(
+      name: 'KEYWORD_EXPRESSION',
+      description: 'This will run tests which contain names that match the given string expression  (Optional)',
+      defaultValue: '',
+    )
     string(
       name: 'TR_CASE_IDS',
-      description: 'IDs of the TestRail case, separated by a comma. (Optional)',
+      description: 'IDs of the TestRail case, separated by a comma (Optional)',
       defaultValue: '',
     )
   }
@@ -84,15 +85,21 @@ pipeline {
             credentialsId: 'infura-e2e-token',
             variable: 'WEB3_INFURA_PROJECT_ID'
           ),
+          file(
+            credentialsId: "mobile-tests-eth-accounts",
+            variable: 'TEST_ETH_ACCOUNTS_FILE'
+          ),
         ]) {
           dir('test/appium/tests') {
+            /* Provide Eth test account secrets. */
+            sh 'cp -f $TEST_ETH_ACCOUNTS_FILE users.py'
             sh """
               python3 -m pytest \
                 --numprocesses 15 \
                 --rerun_count=2 \
                 --testrail_report=True \
-                -m "${params.TEST_MARKERS}" \
-                --network=${params.NETWORK} \
+                -m \"${params.TEST_MARKERS}\" \
+                -k \"${params.KEYWORD_EXPRESSION}\" \
                 --apk=${params.APK_NAME} \
                 --build=PR-${params.PR_ID} \
                 --pr_number=${params.PR_ID} \

ci/tests/Jenkinsfile.e2e-upgrade

@@ -3,11 +3,6 @@ pipeline {
   agent { label 'linux' }
 
   parameters {
-    string(
-      name: 'NETWORK',
-      description: 'Name of test network to use',
-      defaultValue: 'ropsten',
-    )
     string(
       name: 'APK_NAME',
       description: 'Filename of APK uploaded to SauceLabs (base for upgrade, usually release build)',
@@ -16,6 +11,16 @@ pipeline {
       name: 'APK_NAME_UPGRADE',
       description: 'Filename of APK of upgraded application (installed on top of base)',
     )
+     string(
+      name: 'KEYWORD_EXPRESSION',
+      description: 'This will run tests which contain names that match the given string expression  (Optional)',
+      defaultValue: '',
+    )
+     string(
+      name: 'TR_CASE_IDS',
+      description: 'IDs of the TestRail case, separated by a comma (Optional)',
+      defaultValue: '',
+    )
   }
 
   options {
@@ -32,7 +37,12 @@ pipeline {
       } }
     }
     stage('Test') {
-      steps {
+      steps { script {
+       /* for managing optional arguments */
+        def extraPytestOpts = ''
+        if (params.TR_CASE_IDS != '') {
+          extraPytestOpts = "--run_testrail_ids='${params.TR_CASE_IDS}'"
+        }
         withCredentials([
           usernamePassword(
             credentialsId:  'test-rail-api',
@@ -52,22 +62,29 @@ pipeline {
             credentialsId: 'infura-e2e-token',
             variable: 'WEB3_INFURA_PROJECT_ID'
           ),
+          file(
+            credentialsId: "mobile-tests-eth-accounts",
+            variable: 'TEST_ETH_ACCOUNTS_FILE'
+          ),
         ]) {
           dir('test/appium/tests') {
+            /* Provide Eth test accounts secrets. */
+            sh 'cp -f $TEST_ETH_ACCOUNTS_FILE users.py'
             sh """
               python3 -m pytest \
-                -m upgrade \
+                -m "upgrade" \
+                -k \"${params.KEYWORD_EXPRESSION}\" \
                 --numprocesses 15 \
                 --rerun_count=2 \
                 --testrail_report=True \
-                --network=${params.NETWORK} \
                 --apk=${params.APK_NAME} \
-                --apk_upgrade=${params.APK_NAME_UPGRADE}
+                --apk_upgrade=${params.APK_NAME_UPGRADE} \
+                 ${extraPytestOpts}
             """
           }
         }
       }
-    }
+    } }
   }
 
   post {

doc/DEPENDENCIES.md

@@ -163,4 +163,8 @@ used for some abi encoding primitives
 
 ## "rn-emoji-keyboard": "https://github.com/status-im/rn-emoji-keyboard"
 
-Used for taking emoji input, for custom emoji thumbnails for community channels
+Used for taking emoji input, for custom emoji thumbnails for community channels
+
+## "react-native-draggable-flatlist": "https://github.com/computerjazz/react-native-draggable-flatlist"
+
+A drag-and-drop-enabled FlatList component for React Native

doc/STARTING_GUIDE.md

@@ -10,13 +10,6 @@ make shell TARGET=android
 ```
 This step will take a while the first time as it will download all dependencies.
 
-To build the app, your can simply run on of the following:
-```
-make release-android
-make release-ios
-```
-For more `make` targets run `make help`.
-
 # Development
 
 There are three steps necessary to start development, in this case for Android:
@@ -28,6 +21,25 @@ There are three steps necessary to start development, in this case for Android:
 The first two will continue watching for changes and keep re-building the app. They need to be ready first.
 The last one will exit once the app is up and ready.
 
+You need to have your emulator or real devices running and visible to adb, before you run `make run-android`.
+
+# Build release
+
+To build the app, your can simply run on of the following:
+```
+make release-android
+make release-ios
+```
+
+For more `make` targets run `make help`.
+
+# Updating Dependencies
+
+* `make nix-update-pods` - iOS CocoaPods dependencies (updates `ios/Podfile` and `ios/Podfile.loc`)
+* `make nix-update-gradle` - Android Gradle/Maven dependencies (updates `nix/deps/gradle/deps.json`)
+* `make nix-update-clojure` - Clojure Maven dependencies (updates `nix/deps/clojure/deps.json`)
+* `make nix-update-gems` - Fastlane Ruby dependencies (updates `fastlane/Gemfile.lock` and `fastlane/gemset.nix`)
+
 # Manual Steps
 
 There are a few manual steps you might want to do in order to start contributing.