Merge branch 'staging'

EdgeApp · Feb 15, 2022 · e29a886 · e29a886
2 parents 184339f + 720eb51
commit e29a886
Show file tree

Hide file tree

Showing 37 changed files with 595 additions and 619 deletions.
diff --git a/.flowconfig b/.flowconfig
@@ -27,8 +27,8 @@ node_modules/react-native/Libraries/polyfills/.*
 [include]
 
 [libs]
-node_modules/react-native/Libraries/react-native/react-native-interface.js
-node_modules/react-native/flow/
+# node_modules/react-native/Libraries/react-native/react-native-interface.js
+# node_modules/react-native/flow/
 
 [options]
 emoji=true

diff --git a/.github/workflows/pr-rebase.yml b/.github/workflows/pr-rebase.yml
@@ -8,8 +8,9 @@ jobs:
     if: >-
       github.event.issue.pull_request != '' && 
       (
-        contains(github.event.comment.body, '/rebase') || 
-        contains(github.event.comment.body, '/autosquash')
+        contains(github.event.comment.body, '/autosquash') || 
+        contains(github.event.comment.body, '/fixup') ||
+        contains(github.event.comment.body, '/rebase')
       )
     runs-on: ubuntu-latest
     steps:
@@ -21,6 +22,6 @@ jobs:
       - name: Automatic Rebase
         uses: samholmes/rebase@autosquash
         with:
-          autosquash: ${{ contains(github.event.comment.body, '/autosquash') || contains(github.event.comment.body, '/rebase-autosquash') }}
+          autosquash: ${{ true }}
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,23 @@
 # edge-react-gui
 
+## 2.11.0 (2022-02-14)
+
+- Add Solana (SOL) support
+- Add error localization
+- Fix staking end date display
+- Fix Bitpay error for unsupported currencies
+- Fix React Native Promise type-checking
+- Log error stack traces in development mode
+- Upgrade edge-core-js to v0.19.5
+  - changed: Send the optional keyOptions parameter through the importKey methods.
+  - fixed: Remove JCenter from the Android build file.
+- Upgrade edge-currency-accountbased to v0.12.2
+  - Add Solana (SOL)
+  - FIO: Abstract unlockDate calculation into a getUnlockDate method
+  - SOL: Use industry standard derivation path
+  - SOL: Prevent sending empty memo
+  - SOL: Update explorer links
+
 ## 2.10.0 (2022-02-03)
 
 - FIO: Add staking support

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -15,10 +15,10 @@ PODS:
   - CNIOLinux (2.32.3)
   - CNIOWindows (2.32.3)
   - CocoaAsyncSocket (7.6.5)
-  - disklet (0.4.5):
+  - disklet (0.5.2):
     - React
   - DoubleConversion (1.1.6)
-  - edge-core-js (0.19.4):
+  - edge-core-js (0.19.5):
     - React
   - edge-login-ui-rn (0.9.29):
     - React
@@ -414,13 +414,13 @@ PODS:
   - react-native-fast-crypto (2.0.0):
     - OpenSSL-Universal
     - React
-  - react-native-flipper (0.87.0):
+  - react-native-flipper (0.131.1):
     - React-Core
   - react-native-image-picker (4.0.6):
     - React-Core
   - react-native-mail (6.1.1):
     - React-Core
-  - react-native-mymonero-core (0.1.0):
+  - react-native-mymonero-core (0.1.1):
     - React
   - react-native-netinfo (5.9.10):
     - React-Core
@@ -537,7 +537,7 @@ PODS:
     - React-Core
   - RNQrGenerator (1.1.7):
     - React
-  - RNReanimated (2.2.0):
+  - RNReanimated (2.3.1):
     - DoubleConversion
     - FBLazyVector
     - FBReactNativeSpec
@@ -563,7 +563,6 @@ PODS:
     - React-RCTNetwork
     - React-RCTSettings
     - React-RCTText
-    - React-RCTVibration
     - ReactCommon/turbomodule/core
     - Yoga
   - RNShare (7.1.2):
@@ -985,9 +984,9 @@ SPEC CHECKSUMS:
   CNIOLinux: 5921dfefbc4bbe017380b34c510855622147ea41
   CNIOWindows: f5aa9dfb401b440a7b4c9cd911e53e981a787193
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
-  disklet: 4f586f90b70fdb46f06614a5b7342eda5c90f253
+  disklet: e7ed3e673ccad9d175a1675f9f3589ffbf69a5fd
   DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
-  edge-core-js: fd0711a17c4f282d4b33898c9a66433ea48ce29f
+  edge-core-js: 351b78ee9c2839dea279c5addd96ec32013d0a97
   edge-login-ui-rn: bb229d0087d664f76a03949df7627ed49fed4144
   FBLazyVector: e686045572151edef46010a6f819ade377dfeb4b
   FBReactNativeSpec: 86d9e030dbb7af0ba0eb4e1b6d52e4af26c7f1f3
@@ -1038,10 +1037,10 @@ SPEC CHECKSUMS:
   react-native-camera: b322bc25f47536219473c6d00c666d221f7f2695
   react-native-contacts: 493b583e87eb9cb1ab09268e89e526baf1a7cb30
   react-native-fast-crypto: b6dea8324fb1b095dd4f29a80356b43acb3ee2e9
-  react-native-flipper: a5770950f79017f17f50b316cb74b66d14192c79
+  react-native-flipper: 8d0ada062fbc2c7460cc0d343aded6fc3f9c90dc
   react-native-image-picker: a6e56460d34905c849ada551db30897dc7f3d535
   react-native-mail: 8fdcd3aef007c33a6877a18eb4cf7447a1d4ce4a
-  react-native-mymonero-core: c5e0e039b4977be65ed936a1d5301da3448edff7
+  react-native-mymonero-core: 59aaed6e2aef48f8d0e12b564e1927d613076b86
   react-native-netinfo: 30fb89fa913c342be82a887b56e96be6d71201dd
   react-native-safari-view: 955d7160d159241b8e9395d12d10ea0ef863dcdd
   react-native-smart-splash-screen: a961513689f11d63e8496684c2fa4be2d24fe23b
@@ -1074,7 +1073,7 @@ SPEC CHECKSUMS:
   RNLocalize: 43f6c30d8e19ad92282ae434d310fb463b31f419
   RNPermissions: 58c1eb5638504e3afda963a8b0f43b6752132b05
   RNQrGenerator: 86fb623932ed29627c6a95b8dc94af5e93d8abe1
-  RNReanimated: 9c13c86454bfd54dab7505c1a054470bfecd2563
+  RNReanimated: 7f143675d94978c3555345d5bfa8ed6ae800c5d3
   RNShare: 0fec82bd2e67d09f895937ccb4f5a097e714dec2
   RNSound: da030221e6ac7e8290c6b43f2b5f2133a8e225b0
   RNStoreReview: 62d6afd7c37db711a594bbffca6b0ea3a812b7a8

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "edge-react-gui",
-  "version": "2.10.0",
+  "version": "2.11.0",
   "private": true,
   "description": "Edge Wallet React GUI",
   "homepage": "https://edge.app",
@@ -63,6 +63,7 @@
     "codecov": "3.5.0",
     "core-js": "2.5.3",
     "create-hash": "1.2.0",
+    "deprecated-react-native-listview": "0.0.7",
     "elliptic": "6.4.1",
     "eosjs-api": "https://github.com/EdgeApp/eosjs-api.git#prepare-script",
     "hash-base": "3.0.4",
@@ -79,6 +80,7 @@
     "safe-buffer": "5.1.2",
     "scrypt.js": "0.3.0",
     "sha.js": "2.4.11",
+    "tweetnacl": "^1.0.3",
     "uuid": "3.3.2"
   },
   "dependencies": {
@@ -102,9 +104,9 @@
     "dateformat": "^3.0.3",
     "detect-bundler": "^1.0.0",
     "detox": "^18.10.0",
-    "disklet": "^0.4.5",
-    "edge-core-js": "^0.19.4",
-    "edge-currency-accountbased": "^0.11.11",
+    "disklet": "^0.5.2",
+    "edge-core-js": "^0.19.5",
+    "edge-currency-accountbased": "^0.12.2",
     "edge-currency-bitcoin": "^4.9.20",
     "edge-currency-monero": "^0.3.4",
     "edge-exchange-plugins": "^0.12.8",
@@ -125,7 +127,7 @@
     "react-native-extra-dimensions-android": "^1.2.5",
     "react-native-fast-crypto": "^2.0.0",
     "react-native-fast-image": "^8.3.7",
-    "react-native-flipper": "^0.87.0",
+    "react-native-flipper": "^0.131.1",
     "react-native-fs": "https://github.com/EdgeApp/react-native-fs.git#edge/removeEncoding",
     "react-native-gesture-handler": "^1.10.3",
     "react-native-image-picker": "^4.0.6",
@@ -134,11 +136,11 @@
     "react-native-localize": "^2.0.2",
     "react-native-mail": "^6.1.1",
     "react-native-material-textfield": "^0.16.1",
-    "react-native-mymonero-core": "^0.1.0",
+    "react-native-mymonero-core": "^0.1.1",
     "react-native-patina": "^0.1.6",
     "react-native-permissions": "^3.0.0",
     "react-native-popup-menu": "0.13.3",
-    "react-native-reanimated": "^2.2.0",
+    "react-native-reanimated": "^2.3.1",
     "react-native-router-flux": "4.0.6",
     "react-native-safari-view": "^2.1.0",
     "react-native-safe-area-view": "0.14.9",
@@ -155,7 +157,7 @@
     "react-native-zcash": "^0.2.0",
     "react-redux": "^7.2.4",
     "redux": "^4.1.0",
-    "redux-flipper": "^1.4.2",
+    "redux-flipper": "^2.0.1",
     "redux-thunk": "^2.3.0",
     "rn-qr-generator": "^1.1.7",
     "sprintf-js": "^1.1.1",
@@ -197,6 +199,7 @@
     "rollup": "^1.1.2",
     "rollup-plugin-node-resolve": "4.0.0",
     "sucrase": "^3.20.0",
+    "tweetnacl": "^1.0.3",
     "updot": "^1.1.7",
     "webpack": "^4.46.0",
     "webpack-cli": "^4.9.1",