Merge branch 'staging'

EdgeApp · Aug 31, 2021 · 1b88619 · 1b88619
2 parents d8ed212 + ff79b4c
commit 1b88619
Show file tree

Hide file tree

Showing 191 changed files with 2,565 additions and 3,448 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,46 @@
 # edge-react-gui
 
+## 2.1.0 (2021-08-23)
+
+- New UI2 themed Scan scene
+- Reimplement OutlinedTextInput
+- New UI2 themed raw text modal
+- Replace old modals with themed ButtonsModal
+- Add Resync option to tokens
+- Add minimum balance check to Exchange and partner plugins scenes
+- Add type-checking to react-native-router-flux
+- Remove tab bar from Request scene
+- Remove magnifying glass icon from Address modal
+- Always check clipboard for address when entering Send scene
+- Fix button text font size and autoshrinking
+- Fix FlipInput component visual issues
+- Fix FIO Request button
+- Fix error when cancelling the share menu
+- Fix crash when cancelling high fee modal
+- Fix keyboard hiding PIN entry on Send scene
+- Fix tokens still appearing in list after deletion
+- Add apikey to Fantom initialization
+- Unfocus keyboard when side menu is opened
+- Remove edge-components
+- Various text and visual fixes
+- Update translations
+- Upgrade edge-core-js to v0.18.5
+  - fixed: If multiple metadata files exist for a single transaction, always load the oldest one
+- Upgrade edge-currency-bitcoin to v4.9.18
+  - BCH: Update xpub explorer URL
+- Upgrade edge-login-ui-rn to v0.9.16
+  rn: Fix Change PIN scene losing access to keyboard
+  rn: Fix error when cancelling sending
+  rn: Enable Typescript strict mode and fix type definitions
+  rn: Update translations
+- Upgrade edge-currency-accountbased to v0.7.71
+  - FTM: Add apikey to ftmscan.com requests
+
 ## 2.0.19 (2021-08-20)
 
 - Fix issue with sending ERC-20 tokens
+- Upgrade edge-currency-accountbased to v0.7.69
+  - Fix: Regression caused by EIP-681 parseUri implementation
 
 ## 2.0.18 (2021-08-18)
 

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -90,6 +90,7 @@ pipeline {
           branch 'master'
           branch 'test-feta'
           branch 'test-gouda'
+          branch 'test-halloumi'
           branch 'test-paneer'
           branch 'test'
           branch 'yolo'

diff --git a/copy-components.sh b/copy-components.sh
diff --git a/env.example.json b/env.example.json
@@ -33,6 +33,9 @@
     "affiliateId": "",
     "affiliateMargin": 0.5
   },
+  "X_FANTOM_INIT": {
+    "ftmscanApiKey": ""
+  },
   "x_FOX_INIT": {
     "apiKey": ""
   },

diff --git a/flow-typed/react-native-image-picker.js.flow b/flow-typed/react-native-image-picker.js.flow
@@ -0,0 +1,51 @@
+// @flow
+
+declare module 'react-native-image-picker' {
+  declare export type Callback = (response: ImagePickerResponse) => mixed
+  declare export type PhotoQuality = 0 | 0.1 | 0.2 | 0.3 | 0.4 | 0.5 | 0.6 | 0.7 | 0.8 | 0.9 | 1
+  declare export type CameraType = 'back' | 'front'
+  declare export type MediaType = 'photo' | 'video' | 'mixed'
+  declare export type AndroidVideoOptions = 'low' | 'high'
+  declare export type iOSVideoOptions = 'low' | 'medium' | 'high'
+  declare export type ErrorCode = 'camera_unavailable' | 'permission' | 'others'
+
+  declare export type ImageLibraryOptions = {
+    selectionLimit?: number,
+    mediaType: MediaType,
+    maxWidth?: number,
+    maxHeight?: number,
+    quality?: PhotoQuality,
+    videoQuality?: AndroidVideoOptions | iOSVideoOptions,
+    includeBase64?: boolean
+  }
+  declare export type CameraOptions = {
+    mediaType: MediaType,
+    maxWidth?: number,
+    maxHeight?: number,
+    quality?: PhotoQuality,
+    videoQuality?: AndroidVideoOptions | iOSVideoOptions,
+    includeBase64?: boolean,
+    durationLimit?: number,
+    saveToPhotos?: boolean,
+    cameraType?: CameraType
+  }
+  declare export type Asset = {
+    base64?: string,
+    uri?: string,
+    width?: number,
+    height?: number,
+    fileSize?: number,
+    type?: string,
+    fileName?: string,
+    duration?: number
+  }
+  declare export type ImagePickerResponse = {
+    didCancel?: boolean,
+    errorCode?: ErrorCode,
+    errorMessage?: string,
+    assets?: Asset[]
+  }
+
+  declare export function launchCamera(options: CameraOptions, callback: Callback): void
+  declare export function launchImageLibrary(options: ImageLibraryOptions, callback: Callback): void
+}
diff --git a/flow-typed/react-native-router-flux.js b/flow-typed/react-native-router-flux.js
@@ -0,0 +1,19 @@
+// @flow
+
+declare module 'react-native-router-flux' {
+  declare type FluxRouterProps = {}
+  declare class Drawer extends React.Component<FluxRouterProps> {}
+  declare class Router extends React.Component<FluxRouterProps> {}
+  declare class Scene extends React.Component<FluxRouterProps> {}
+  declare class Stack extends React.Component<FluxRouterProps> {}
+  declare class Tabs extends React.Component<FluxRouterProps> {}
+
+  // See ../src/types/routerTypes.js for wrapped versions of:
+  // Actions
+
+  declare type DontUse = {
+    useTheEdgeWrapperInstead: true
+  }
+
+  declare var Actions: DontUse
+}
diff --git a/index.js b/index.js
@@ -4,8 +4,12 @@ import 'react-native-gesture-handler'
 import './src/app.js'
 
 import { AppRegistry } from 'react-native'
+import Animated from 'react-native-reanimated'
 
 import { name as appName } from './app.json'
 import { App } from './src/components/App.js'
 
+// See https://github.com/software-mansion/react-native-reanimated/issues/1794#issuecomment-898393331
+Animated.addWhitelistedNativeProps({})
+
 AppRegistry.registerComponent(appName, () => App)
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -8,7 +8,7 @@ PODS:
   - disklet (0.4.5):
     - React
   - DoubleConversion (1.1.6)
-  - edge-login-ui-rn (0.9.14):
+  - edge-login-ui-rn (0.9.16):
     - React
   - FBLazyVector (0.64.2)
   - FBReactNativeSpec (0.64.2):
@@ -385,6 +385,8 @@ PODS:
     - React
   - react-native-flipper (0.87.0):
     - React-Core
+  - react-native-image-picker (4.0.6):
+    - React-Core
   - react-native-mail (6.0.0):
     - React-Core
   - react-native-mymonero-core (0.1.0):
@@ -497,7 +499,9 @@ PODS:
     - React-Core
   - RNPermissions (3.0.2):
     - React-Core
-  - RNReanimated (2.0.0):
+  - RNQrGenerator (1.1.7):
+    - React
+  - RNReanimated (2.2.0):
     - DoubleConversion
     - FBLazyVector
     - FBReactNativeSpec
@@ -601,6 +605,7 @@ DEPENDENCIES:
   - react-native-contacts (from `../node_modules/react-native-contacts`)
   - react-native-fast-crypto (from `../node_modules/react-native-fast-crypto`)
   - react-native-flipper (from `../node_modules/react-native-flipper`)
+  - react-native-image-picker (from `../node_modules/react-native-image-picker`)
   - react-native-mail (from `../node_modules/react-native-mail`)
   - react-native-mymonero-core (from `../node_modules/react-native-mymonero-core`)
   - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
@@ -633,6 +638,7 @@ DEPENDENCIES:
   - RNGestureHandler (from `../node_modules/react-native-gesture-handler`)
   - RNLocalize (from `../node_modules/react-native-localize`)
   - RNPermissions (from `../node_modules/react-native-permissions`)
+  - RNQrGenerator (from `../node_modules/rn-qr-generator`)
   - RNReanimated (from `../node_modules/react-native-reanimated`)
   - RNShare (from `../node_modules/react-native-share`)
   - RNSound (from `../node_modules/react-native-sound`)
@@ -731,6 +737,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-fast-crypto"
   react-native-flipper:
     :path: "../node_modules/react-native-flipper"
+  react-native-image-picker:
+    :path: "../node_modules/react-native-image-picker"
   react-native-mail:
     :path: "../node_modules/react-native-mail"
   react-native-mymonero-core:
@@ -795,6 +803,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-localize"
   RNPermissions:
     :path: "../node_modules/react-native-permissions"
+  RNQrGenerator:
+    :path: "../node_modules/rn-qr-generator"
   RNReanimated:
     :path: "../node_modules/react-native-reanimated"
   RNShare:
@@ -819,7 +829,7 @@ SPEC CHECKSUMS:
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   disklet: 4f586f90b70fdb46f06614a5b7342eda5c90f253
   DoubleConversion: cf9b38bf0b2d048436d9a82ad2abe1404f11e7de
-  edge-login-ui-rn: 3de2a56437484e802e02c033e803ee1e8ff29aef
+  edge-login-ui-rn: 60941cb56a08dfc8ddc4852c2ca4329ce967f20b
   FBLazyVector: e686045572151edef46010a6f819ade377dfeb4b
   FBReactNativeSpec: 86d9e030dbb7af0ba0eb4e1b6d52e4af26c7f1f3
   Firebase: e1e089d9aac215a52442583f818ab61de3c4581b
@@ -867,6 +877,7 @@ SPEC CHECKSUMS:
   react-native-contacts: 493b583e87eb9cb1ab09268e89e526baf1a7cb30
   react-native-fast-crypto: b6dea8324fb1b095dd4f29a80356b43acb3ee2e9
   react-native-flipper: a5770950f79017f17f50b316cb74b66d14192c79
+  react-native-image-picker: a6e56460d34905c849ada551db30897dc7f3d535
   react-native-mail: 88305252f4c3fb0157015ff8a7ac9c41b321a0dd
   react-native-mymonero-core: c5e0e039b4977be65ed936a1d5301da3448edff7
   react-native-netinfo: 30fb89fa913c342be82a887b56e96be6d71201dd
@@ -899,7 +910,8 @@ SPEC CHECKSUMS:
   RNGestureHandler: a479ebd5ed4221a810967000735517df0d2db211
   RNLocalize: 43f6c30d8e19ad92282ae434d310fb463b31f419
   RNPermissions: 58c1eb5638504e3afda963a8b0f43b6752132b05
-  RNReanimated: 64f6c5789f82818c07ba3c71864b73619cb23c76
+  RNQrGenerator: 86fb623932ed29627c6a95b8dc94af5e93d8abe1
+  RNReanimated: 9c13c86454bfd54dab7505c1a054470bfecd2563
   RNShare: 8af5349f05fc042d230674dd650d19789187ff9c
   RNSound: da030221e6ac7e8290c6b43f2b5f2133a8e225b0
   RNStoreReview: 62d6afd7c37db711a594bbffca6b0ea3a812b7a8
@@ -911,4 +923,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 99afeb1d9ab89efc9196aae342f9809649de3fe1
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.10.2
diff --git a/jest.config.js b/jest.config.js
@@ -8,7 +8,7 @@ const config = {
   testPathIgnorePatterns: ['<rootDir>/node_modules', '<rootDir>/e2e'],
 
   // Don't run node_modules through Babel, except specific ones that still need it:
-  transformIgnorePatterns: ['<rootDir>/node_modules/(?!(edge-components/|@react-native|react-native|react-navigation))']
+  transformIgnorePatterns: ['<rootDir>/node_modules/(?!(@react-native|react-native|react-navigation))']
 }
 
 // Produce junit and cobertura output when on Jenkins:

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "edge-react-gui",
-  "version": "2.0.19",
+  "version": "2.1.0",
   "private": true,
   "description": "Edge Wallet React GUI",
   "homepage": "https://edge.app",
@@ -106,13 +106,12 @@
     "detect-bundler": "^1.0.0",
     "detox": "^18.10.0",
     "disklet": "^0.4.5",
-    "edge-components": "^0.0.31",
-    "edge-core-js": "^0.18.4",
-    "edge-currency-accountbased": "^0.7.70",
-    "edge-currency-bitcoin": "^4.9.17",
+    "edge-core-js": "^0.18.5",
+    "edge-currency-accountbased": "^0.7.71",
+    "edge-currency-bitcoin": "^4.9.18",
     "edge-currency-monero": "^0.3.2",
     "edge-exchange-plugins": "^0.11.32",
-    "edge-login-ui-rn": "^0.9.14",
+    "edge-login-ui-rn": "^0.9.16",
     "edge-plugin-bity": "https://github.com/EdgeApp/edge-plugin-bity.git#f04ee29c23bf5621f87dedb6d2fb1c83a18781bc",
     "edge-plugin-simplex": "https://github.com/EdgeApp/edge-plugin-simplex.git#efb0f2280192894e4c24e28e297d0e466f2d333b",
     "edge-plugin-wyre": "https://github.com/EdgeApp/edge-plugin-wyre.git#5aa2379dbd4045b8a514427b442bd59ca57c21b0",
@@ -132,6 +131,7 @@
     "react-native-flipper": "^0.87.0",
     "react-native-fs": "git://github.com/EdgeApp/react-native-fs.git#edge/removeEncoding",
     "react-native-gesture-handler": "^1.10.3",
+    "react-native-image-picker": "^4.0.6",
     "react-native-keyboard-aware-scroll-view": "^0.9.3",
     "react-native-linear-gradient": "^2.5.6",
     "react-native-localize": "^2.0.2",
@@ -143,7 +143,7 @@
     "react-native-permissions": "^3.0.0",
     "react-native-popup-menu": "0.13.3",
     "react-native-randombytes": "^3.5.3",
-    "react-native-reanimated": "^2.0.0",
+    "react-native-reanimated": "^2.2.0",
     "react-native-router-flux": "4.0.6",
     "react-native-safari-view": "^2.1.0",
     "react-native-safe-area-view": "0.14.9",
@@ -161,6 +161,7 @@
     "redux": "^4.1.0",
     "redux-flipper": "^1.4.2",
     "redux-thunk": "^2.3.0",
+    "rn-qr-generator": "^1.1.7",
     "sprintf-js": "^1.1.1",
     "url-parse": "^1.4.4",
     "why-did-you-update": "^0.1.1"
@@ -169,6 +170,7 @@
     "@babel/core": "^7.12.9",
     "@babel/preset-env": "^7.6.0",
     "@babel/runtime": "^7.12.5",
+    "@sucrase/webpack-loader": "^2.0.0",
     "appcenter-cli": "^2.7.3",
     "babel-eslint": "^10.1.0",
     "babel-jest": "^26.6.3",
@@ -199,7 +201,7 @@
     "react-test-renderer": "17.0.1",
     "rollup": "^1.1.2",
     "rollup-plugin-node-resolve": "4.0.0",
-    "sucrase": "^3.15.0",
+    "sucrase": "^3.20.0",
     "updot": "^1.1.7",
     "webpack": "^4.29.3",
     "webpack-cli": "^3.2.3"

diff --git a/scripts/updateVersion.js b/scripts/updateVersion.js
@@ -33,6 +33,7 @@ const specialBranches: { [branch: string]: string } = {
   yolo: '-yolo',
   'test-feta': '-feta',
   'test-gouda': '-gouda',
+  'test-halloumi': '-halloumi',
   'test-paneer': '-paneer'
 }
 

diff --git a/src/__tests__/SettingsScene.test.js b/src/__tests__/SettingsScene.test.js
@@ -36,6 +36,7 @@ describe('MyComponent', () => {
         // DispatchProps:
         confirmPassword={nop}
         dispatchUpdateEnableTouchIdEnable={nop}
+        handleSendLogs={nop}
         lockSettings={nop}
         onTogglePinLoginEnabled={nop}
         resetConfirmPasswordError={nop}
@@ -67,6 +68,7 @@ describe('MyComponent', () => {
         confirmPassword={nop}
         dispatchUpdateEnableTouchIdEnable={nop}
         lockSettings={nop}
+        handleSendLogs={nop}
         onTogglePinLoginEnabled={nop}
         resetConfirmPasswordError={nop}
         setAutoLogoutTimeInSeconds={nop}

diff --git a/src/__tests__/__snapshots__/RootReducer.test.js.snap b/src/__tests__/__snapshots__/RootReducer.test.js.snap
@@ -142,14 +142,6 @@ Object {
         "useLegacyAddress": false,
       },
       "scan": Object {
-        "parsedUri": null,
-        "privateKeyModal": Object {
-          "error": null,
-          "isSweeping": false,
-          "secondaryModal": Object {
-            "isActive": false,
-          },
-        },
         "scanEnabled": false,
         "torchEnabled": false,
       },
@@ -204,17 +196,6 @@ Object {
         "transactionIdMap": Object {},
         "transactions": Array [],
       },
-      "uniqueIdentifierModal": Object {
-        "isActive": false,
-        "uniqueIdentifier": undefined,
-      },
-      "walletList": Object {
-        "viewXPubWalletModalVisible": false,
-        "walletArchivesVisible": false,
-        "walletId": "",
-        "xPubExplorer": "",
-        "xPubSyntax": "",
-      },
     },
     "settings": Object {
       "AAVE": Object {