Merge branch 'staging'

Author: peachbits

.eslintrc.json

@@ -1,38 +1,23 @@
 {
   "extends": [
     "standard-kit/prettier",
-    "standard-kit/prettier/node",
     "standard-kit/prettier/jsx",
     "standard-kit/prettier/flow",
-    "plugin:react-native/all",
-    "plugin:react/recommended"
+    "standard-kit/prettier/node",
+    "standard-kit/prettier/react",
+    "plugin:react-native/all"
   ],
   "globals": {
     "fetch": true
   },
-  "parser": "babel-eslint",
-  "plugins": ["react-native", "react", "simple-import-sort", "detox"],
+  "plugins": [
+    "detox", "simple-import-sort"
+  ],
   "rules": {
-    "camelcase": "warn",
-    "flowtype/array-style-complex-type": ["error", "verbose"],
-    "flowtype/array-style-simple-type": ["error", "shorthand"],
-    "flowtype/require-valid-file-annotation": [2, "always"],
-    "no-var": "error",
-    "react-native/no-inline-styles": 0,
+    "react-native/no-inline-styles": "off",
     "react-native/no-raw-text": ["error", { "skip": ["FormattedText", "T", "B"] }],
-    "react-native/no-unused-styles": 0,
-    "react-native/split-platform-components": 2,
-    "react/jsx-indent-props": ["error", 2],
-    "react/jsx-no-duplicate-props": ["error", { "ignoreCase": true }],
-    "react/no-array-index-key": "error",
-    "react/no-string-refs": 0,
-    "react/no-typos": "error",
-    "react/prop-types": 0,
-    "react/self-closing-comp": ["error", { "component": true }],
-    "simple-import-sort/sort": "error",
-    "no-prototype-builtins": "off",
     "react/jsx-handler-names": "off",
-    "react-native/sort-styles": "off"
+    "simple-import-sort/imports": "error"
   },
   "settings": {
     "react": { "pragma": "React", "version": "16.8.0", "flowVersion": "0.66" }

.travis.yml

@@ -1,78 +1,11 @@
 language: node_js
 node_js:
-  - "10.15.3"
-sudo: required
-cache:
-  directories:
-    - $HOME/.npm
-    - $HOME/.gradle/caches/
-    - $HOME/.gradle/wrapper/
-    - $HOME/.android/build-cache
+  - 14
+before_install:
+  - cp env.example.json env.json
+install:
+  - yarn install --frozen-lockfile --ignore-optional --network-concurrency 1
 script:
-  - npm i react-native-cli -g
-matrix:
-  include:
-    - language: android
-      os: linux
-      jdk: oraclejdk8
-      before_cache:
-        - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock
-        - rm -fr $HOME/.gradle/caches/*/plugin-resolution/
-      sudo: required
-      node_js: false
-      before_install:
-        - nvm install 10.15.3
-        - nvm use 10.15.3
-        - node --version
-        # install NDK
-        - openssl aes-256-cbc -K $encrypted_e28d423744bc_key -iv $encrypted_e28d423744bc_iv -in env.json.enc -out env.json -d
-        - git clone https://github.com/Airbitz/android-ndk-linux.git $HOME/android-ndk-root
-        - export ANDROID_NDK_HOME=$HOME/android-ndk-root
-        - echo "y" | sdkmanager "cmake;3.6.4111459"
-        - npm install -g [email protected]
-        - echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf && sudo sysctl -p
-      install:
-        - travis_retry yarn install --network-concurrency 1 --child-concurrency 1 --ignore-optional
-      android:
-        components:
-          - tools
-          - platform-tools
-          - build-tools-23.0.1
-          - build-tools-23.0.3
-          - build-tools-25.0.1
-          - build-tools-25.0.3
-          - android-23
-          - android-25
-          - android-27
-          - extra
-          - extra-android-m2repository
-          - extra-android-support
-          - extra-google-google_play_services
-          - extra-google-m2repository
-          - addon-google_apis-google-16
-          - cmake
-        licenses:
-          - '.+'
-      # before_script:
-      #   - npm run precommit
-      script:
-        - cd android && ./gradlew assembleDebug && ./gradlew assembleRelease
-    - language: objective-c
-      os: osx
-      osx_image: xcode10.2
-      node_js: false
-      before_install:
-        - nvm install 10.15.3
-        - nvm use 10.15.3
-        - node --version
-        - openssl aes-256-cbc -K $encrypted_e28d423744bc_key -iv $encrypted_e28d423744bc_iv -in env.json.enc -out env.json -d
-        - npm install -g [email protected]
-      install:
-        - travis_retry gem install xcpretty xcpretty-travis-formatter
-        - travis_retry yarn install --network-concurrency 1 --child-concurrency 1
-
-      xcode_project: ios/edge.xcworkspace
-      xcode_scheme: ios/edge
-      script:
-        - cd ios
-        - node ../execKeepAlive.js 'xcodebuild -workspace edge.xcworkspace -derivedDataPath build clean build -scheme edge -configuration release -sdk iphonesimulator12.2 CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY=""' | xcpretty -f `xcpretty-travis-formatter`
+  - yarn lint
+  - yarn flow
+  - npm run test

CHANGELOG.md

@@ -1,5 +1,35 @@
 # edge-react-gui
 
+## 2.0.12 (2021-06-01)
+
+- Upgrade to React Native v0.64.1
+- Add more currency icons
+- iOS: Fix transaction timestamp accuracy
+- Add additional context modal for Contacts permission
+- Fix missing currency codes in Sweep Private Key wallet picker
+- Add side menu hamburger button to Settings and ToS scenes
+- Text and layout fixes
+- Upgrade edge-currency-accountbased to v0.7.60
+  - Fix a possible race condition where the last queried block height is saved but the actual transactions are not
+  - Always set this.walletLocalDataDirty = true if any transactions have changed
+  - ETH: Use the default token gas limit if getCode reveals the destination is a contract and estimateGas fails to return a gas value
+  - ETH: Allow ethgasstation safeLow estimate less than 1
+  - Update logging
+  - XRP: Remove bogus length checks from the XRP key import
+  - FIO: Refactor SDK initialization so it's only started once per wallet
+- Upgrade edge-currency-monero to v0.3.1
+  - Fix float amount precision
+  - Fix recorded native amount and fee
+  - Import native code directly from react-native-mymonero-core. Before, this plugin relied on "magic" methods passed in via the global object
+- Upgrade edge-exchange-plugins to v0.11.28
+  - Godex: Add the mainnet currency codes to the transaction request
+  - Fox: Check mainnet matches user's wallet
+- Upgrade edge-login-ui-rn to v0.9.4
+  - Prevent user from selecting duplicate recovery questions
+  - Show error on Change Password Recovery Screen when user selecting the same question
+  - Fix spacing issue on create account welcome screen
+  - Prepare for future edge-core-js breaking changes
+
 ## 2.0.11 (2021-05-17)
 
 - Add Fantom (FTM) support with fUSDT

Jenkinsfile

@@ -78,7 +78,7 @@ pipeline {
 
     stage ("Test") {
       steps {
-        sh "npm run cover"
+        sh "JEST_JENKINS=1 yarn cover --ci"
       }
     }
 

android/app/src/main/assets/fonts/custom.ttf

@@ -1,6 +1,7 @@
 {
   "-------- api keys --------": 0,
   "AIRBITZ_API_KEY": "",
+  "BUGSNAG_API_KEY": "",
 
   "-------- GUI plugin options --------": 0,
   "PLUGIN_API_KEYS": {
@@ -22,13 +23,11 @@
     "apiKey": ""
   },
   "x_ETHEREUM_INIT": {
-    "etherscanApiKey": "",
+    "etherscanApiKey": [],
     "infuraProjectId": "",
     "blockchairApiKey": "",
     "alethioApiKey": "",
-    "amberdataApiKey": "",
-    "alchemyApiKey": "",
-    "ethGasStationApiKey": ""
+    "amberdataApiKey": ""
   },
   "x_FAAST_INIT": {
     "affiliateId": "",
@@ -53,9 +52,6 @@
     "affiliateContract": "",
     "apiKey": ""
   },
-  "X_COINSWITCH_INIT": {
-    "apiKey": ""
-  },
   "X_FIO_INIT": {
     "fioRegApiToken": ""
   },