Merge branch 'staging'

EdgeApp · Sep 11, 2023 · 8d067eb · 8d067eb
2 parents 77d3184 + f26dffd
commit 8d067eb
Show file tree

Hide file tree

Showing 67 changed files with 2,032 additions and 1,560 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # edge-react-gui
 
+## 3.15.0
+
+- added: simplified Maestro scripts and use cleaner-config for testerConfig.json
+- changed: updated style sheet caching in the `styled` HOC
+- fixed: prevent crash on transaction history scene when custom token is deleted
+- fixed: added missing cancel button handler in FIO name confirmation scene
+- Upgrade edge-login-ui-rn to v2.6.6
+  - changed: Update translations
+
 ## 3.14.0
 
 - added: Light account support

diff --git a/ios/Podfile b/ios/Podfile
@@ -81,7 +81,4 @@ target 'edge' do
   pod 'CNIOLinux', :modular_headers => true
   pod 'CNIOWindows', :modular_headers => true
 
-  # Piratechain:
-  pod 'react-native-piratechain', :path => '../node_modules/react-native-piratechain'
-  pod 'PirateLightClientKit', :git => 'https://github.com/PirateNetwork/PirateLightClientKit.git', :commit => 'f939db082643d73cead7172da0a862f3b3df34a9'
 end
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -18,11 +18,11 @@ PODS:
   - disklet (0.5.2):
     - React
   - DoubleConversion (1.1.6)
-  - edge-core-js (1.4.1):
+  - edge-core-js (1.4.2):
     - React-Core
-  - edge-currency-accountbased (1.5.2):
+  - edge-currency-accountbased (2.2.4):
     - React-Core
-  - edge-login-ui-rn (2.7.0):
+  - edge-login-ui-rn (2.8.1):
     - React
   - FBLazyVector (0.71.11)
   - FBReactNativeSpec (0.71.11):
@@ -189,7 +189,6 @@ PODS:
     - hermes-engine/Pre-built (= 0.71.11)
   - hermes-engine/Pre-built (0.71.11)
   - libevent (2.1.12)
-  - libpiratelc (0.0.5)
   - libwebp (1.2.1):
     - libwebp/demux (= 1.2.1)
     - libwebp/mux (= 1.2.1)
@@ -218,10 +217,6 @@ PODS:
     - RNPermissions
   - Permission-Notifications (3.8.3):
     - RNPermissions
-  - PirateLightClientKit (0.14.3-beta):
-    - gRPC-Swift (~> 1.0)
-    - libpiratelc (= 0.0.5)
-    - SQLite.swift (~> 0.12.2)
   - PromisesObjC (2.1.0)
   - RCT-Folly (2021.07.22.00):
     - boost
@@ -501,9 +496,10 @@ PODS:
     - React-Core
   - react-native-netinfo (8.3.0):
     - React-Core
-  - react-native-piratechain (0.3.3):
-    - PirateLightClientKit (= 0.14.3-beta)
-    - React
+  - react-native-piratechain (0.3.5):
+    - gRPC-Swift (~> 1.0)
+    - React-Core
+    - SQLite.swift (~> 0.12)
   - react-native-safari-view (1.0.0):
     - React
   - react-native-safe-area-context (4.6.4):
@@ -783,7 +779,7 @@ PODS:
     - SwiftNIOFoundationCompat (< 3, >= 2.32.0)
     - SwiftNIOPosix (< 3, >= 2.32.0)
     - SwiftNIOTLS (< 3, >= 2.32.0)
-  - SwiftProtobuf (1.20.3)
+  - SwiftProtobuf (1.22.1)
   - Yoga (1.14.0)
   - YogaKit (1.18.1):
     - Yoga (~> 1.14)
@@ -841,7 +837,6 @@ DEPENDENCIES:
   - Permission-LocationAlways (from `../node_modules/react-native-permissions/ios/LocationAlways`)
   - Permission-LocationWhenInUse (from `../node_modules/react-native-permissions/ios/LocationWhenInUse`)
   - Permission-Notifications (from `../node_modules/react-native-permissions/ios/Notifications`)
-  - PirateLightClientKit (from `https://github.com/PirateNetwork/PirateLightClientKit.git`, commit `f939db082643d73cead7172da0a862f3b3df34a9`)
   - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`)
   - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`)
   - RCTTypeSafety (from `../node_modules/react-native/Libraries/TypeSafety`)
@@ -951,7 +946,6 @@ SPEC REPOS:
     - GoogleUtilities
     - gRPC-Swift
     - libevent
-    - libpiratelc
     - libwebp
     - Logging
     - nanopb
@@ -1015,9 +1009,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-permissions/ios/LocationWhenInUse"
   Permission-Notifications:
     :path: "../node_modules/react-native-permissions/ios/Notifications"
-  PirateLightClientKit:
-    :commit: f939db082643d73cead7172da0a862f3b3df34a9
-    :git: https://github.com/PirateNetwork/PirateLightClientKit.git
   RCT-Folly:
     :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec"
   RCTRequired:
@@ -1161,11 +1152,6 @@ EXTERNAL SOURCES:
   Yoga:
     :path: "../node_modules/react-native/ReactCommon/yoga"
 
-CHECKOUT OPTIONS:
-  PirateLightClientKit:
-    :commit: f939db082643d73cead7172da0a862f3b3df34a9
-    :git: https://github.com/PirateNetwork/PirateLightClientKit.git
-
 SPEC CHECKSUMS:
   _NIODataStructures: e2077c7dc7c1d6c93e698c85fe04d663a17f53a4
   boost: 57d2868c099736d80fcd648bf211b4431e51a558
@@ -1182,9 +1168,9 @@ SPEC CHECKSUMS:
   CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
   disklet: e7ed3e673ccad9d175a1675f9f3589ffbf69a5fd
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
-  edge-core-js: 8fedecef2b0a09b32fd0a44de7c82c75943cfad3
-  edge-currency-accountbased: 4dfe7753cc360c8b6f2a925251b7e0e9db8554a5
-  edge-login-ui-rn: 20ee19ab6c5036b5ee159f0e40b215e16e8a7952
+  edge-core-js: bd6a3109f6e4989be1d72449c5d7df9572c9336b
+  edge-currency-accountbased: e362a2a40f8202c6b0182ed2b361c0d8c24e70ac
+  edge-login-ui-rn: 865ed79155f7a6559422e2ca844f7b01f987ed92
   FBLazyVector: c511d4cd0210f416cb5c289bd5ae6b36d909b048
   FBReactNativeSpec: a911fb22def57aef1d74215e8b6b8761d25c1c54
   Firebase: 5f8193dff4b5b7c5d5ef72ae54bb76c08e2b841d
@@ -1212,7 +1198,6 @@ SPEC CHECKSUMS:
   gRPC-Swift: 77154009a019e97f8c4bd8f2bb75fe9726801157
   hermes-engine: 34c863b446d0135b85a6536fa5fd89f48196f848
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
-  libpiratelc: 8b923888cb473667fb7a84fa9b590e95a57f8a3d
   libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc
   Logging: beeb016c9c80cf77042d62e83495816847ef108b
   nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
@@ -1223,7 +1208,6 @@ SPEC CHECKSUMS:
   Permission-LocationAlways: 6b001084436e802fb1a3ec725ad81e935ee3a6aa
   Permission-LocationWhenInUse: a7243a69be958b5422bc0deea8bae0c937ca79f6
   Permission-Notifications: 05a9c72e2ae989d28eb1eecf3d6a12daba73d375
-  PirateLightClientKit: b5e76b77affabfc6eb6b1a01dad738d9c58c5ade
   PromisesObjC: 99b6f43f9e1044bd87a95a60beff28c2c44ddb72
   RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
   RCTRequired: f6187ec763637e6a57f5728dd9a3bdabc6d6b4e0
@@ -1249,7 +1233,7 @@ SPEC CHECKSUMS:
   react-native-mail: 8fdcd3aef007c33a6877a18eb4cf7447a1d4ce4a
   react-native-mymonero-core: 780bf854f27a0a905bcef5e7757d2de0a15b4408
   react-native-netinfo: 3671b091c4843fda5e153612866ef4024b8f5d62
-  react-native-piratechain: 3976b76abdc9822d1b23568e4bda8db480df6499
+  react-native-piratechain: b6670583e25d27216c016ce49781a67ea218f352
   react-native-safari-view: 955d7160d159241b8e9395d12d10ea0ef863dcdd
   react-native-safe-area-context: 68b07eabfb0d14547d36f6929c0e98d818064f02
   react-native-tcp-socket: e724380c910c2e704816ec817ed28f1342246ff7
@@ -1312,11 +1296,11 @@ SPEC CHECKSUMS:
   SwiftNIOSSL: 7c2ddcbcbb2a8188468b7fe9c2bc6124df4b3772
   SwiftNIOTLS: 1b8290ec775238ccc714ed842d929494df95a2c2
   SwiftNIOTransportServices: 0b2b407819d82eb63af558c5396e33c945759503
-  SwiftProtobuf: b02b5075dcf60c9f5f403000b3b0c202a11b6ae1
+  SwiftProtobuf: 7773c4e96a99d7b8ab7cda0fc30a883732ff93b1
   Yoga: f7decafdc5e8c125e6fa0da38a687e35238420fa
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: b8006b1d677c7c684b18986cd606d6adc03317b0
+PODFILE CHECKSUM: 94e88a464a12f97deefd1dc898fad1a271469ef2
 
 COCOAPODS: 1.12.1
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "edge-react-gui",
-  "version": "3.16.0",
+  "version": "3.17.0",
   "private": true,
   "description": "Edge Wallet React GUI",
   "homepage": "https://edge.app",
@@ -139,12 +139,12 @@
     "deepmerge": "^4.3.1",
     "detect-bundler": "^1.1.0",
     "disklet": "^0.5.2",
-    "edge-core-js": "^1.4.1",
-    "edge-currency-accountbased": "^1.5.2",
+    "edge-core-js": "^1.4.2",
+    "edge-currency-accountbased": "^2.2.4",
     "edge-currency-monero": "^1.1.1",
     "edge-currency-plugins": "^2.1.0",
-    "edge-exchange-plugins": "^0.20.2",
-    "edge-login-ui-rn": "^2.7.0",
+    "edge-exchange-plugins": "^0.21.4",
+    "edge-login-ui-rn": "^2.8.1",
     "ethers": "^5.6.0",
     "paraswap": "^5.2.0",
     "prompts": "^2.4.2",
@@ -177,7 +177,7 @@
     "react-native-mymonero-core": "^0.3.1",
     "react-native-patina": "^0.1.6",
     "react-native-permissions": "^3.8.3",
-    "react-native-piratechain": "^0.3.3",
+    "react-native-piratechain": "^0.3.5",
     "react-native-popup-menu": "^0.16.1",
     "react-native-reanimated": "^3.3.0",
     "react-native-safari-view": "^2.1.0",

diff --git a/src/__tests__/modals/__snapshots__/AccelerateTxModal.test.tsx.snap b/src/__tests__/modals/__snapshots__/AccelerateTxModal.test.tsx.snap
@@ -53,8 +53,5 @@ exports[`AccelerateTxModalComponent should render with loading props 1`] = `
       showSpinner={false}
     />
   </View>
-  <ModalFooter
-    onPress={[Function]}
-  />
 </ThemedModal>
 `;
diff --git a/src/__tests__/modals/__snapshots__/AddressModal.test.tsx.snap b/src/__tests__/modals/__snapshots__/AddressModal.test.tsx.snap
@@ -75,8 +75,5 @@ exports[`AddressModalComponent should render with loaded props 1`] = `
       type="secondary"
     />
   </View>
-  <ModalFooter
-    onPress={[Function]}
-  />
 </ThemedModal>
 `;
diff --git a/src/__tests__/modals/__snapshots__/AdvancedDetailsModal.test.tsx.snap b/src/__tests__/modals/__snapshots__/AdvancedDetailsModal.test.tsx.snap
@@ -365,67 +365,64 @@ exports[`AdvancedDetailsModal should render with loading props 1`] = `
         </View>
       </RCTScrollView>
     </View>
-    <View>
-      <View>
-        <View
-          accessibilityState={
-            {
-              "busy": undefined,
-              "checked": undefined,
-              "disabled": undefined,
-              "expanded": undefined,
-              "selected": undefined,
-            }
-          }
-          accessibilityValue={
+    <View
+      accessibilityState={
+        {
+          "busy": undefined,
+          "checked": undefined,
+          "disabled": undefined,
+          "expanded": undefined,
+          "selected": undefined,
+        }
+      }
+      accessibilityValue={
+        {
+          "max": undefined,
+          "min": undefined,
+          "now": undefined,
+          "text": undefined,
+        }
+      }
+      accessible={true}
+      collapsable={false}
+      focusable={true}
+      onClick={[Function]}
+      onResponderGrant={[Function]}
+      onResponderMove={[Function]}
+      onResponderRelease={[Function]}
+      onResponderTerminate={[Function]}
+      onResponderTerminationRequest={[Function]}
+      onStartShouldSetResponder={[Function]}
+      style={
+        {
+          "alignItems": "center",
+          "marginBottom": -22,
+          "opacity": 1,
+          "padding": 22,
+        }
+      }
+    >
+      <Text
+        accessibilityHint="Close modal"
+        allowFontScaling={false}
+        style={
+          [
             {
-              "max": undefined,
-              "min": undefined,
-              "now": undefined,
-              "text": undefined,
-            }
-          }
-          accessible={true}
-          collapsable={false}
-          focusable={true}
-          onClick={[Function]}
-          onResponderGrant={[Function]}
-          onResponderMove={[Function]}
-          onResponderRelease={[Function]}
-          onResponderTerminate={[Function]}
-          onResponderTerminationRequest={[Function]}
-          onStartShouldSetResponder={[Function]}
-          style={
+              "color": "#00f1a2",
+              "fontSize": 28,
+            },
+            undefined,
             {
-              "alignItems": "center",
-              "opacity": 1,
-              "padding": 22,
-            }
-          }
-        >
-          <Text
-            accessibilityHint="Close modal"
-            allowFontScaling={false}
-            style={
-              [
-                {
-                  "color": "#00f1a2",
-                  "fontSize": 28,
-                },
-                undefined,
-                {
-                  "fontFamily": "anticon",
-                  "fontStyle": "normal",
-                  "fontWeight": "normal",
-                },
-                {},
-              ]
-            }
-          >
-            
-          </Text>
-        </View>
-      </View>
+              "fontFamily": "anticon",
+              "fontStyle": "normal",
+              "fontWeight": "normal",
+            },
+            {},
+          ]
+        }
+      >
+        
+      </Text>
     </View>
   </View>,
 ]