Skip to content

Commit

Permalink
Merge branch 'staging'
Browse files Browse the repository at this point in the history
  • Loading branch information
swansontec committed Aug 28, 2023
2 parents a46622e + 81928d7 commit 77d3184
Show file tree
Hide file tree
Showing 99 changed files with 5,911 additions and 2,666 deletions.
81 changes: 81 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,86 @@
# edge-react-gui

## 3.14.0

- added: Light account support
- added: PulseChain (PLS)
- added: New animated splash screen logo
- added: Next button on enable token scene
- added: Close button on notification dropdown
- added: Improved Maestro testability
- added: Allow scrolling on wallet creation completion scene
- added: Wallet Birthday Height description on modal for Zcash/Pirate Chain seed import
- changed: Upgrade react-native to 0.71.11
- changed: Rewrite new activation-needed wallet name validation scene
- changed: Reduce bridge traffic by attempting plugin fetches through proxy server
- changed: Reduce excessive FIO plugin calls
- changed: Upgrade GALA token to latest contract
- changed: Disable Firebase AD ID
- changed: Upgrade to ESLint v8
- removed: Unused React-based partner plugins
- fixed: Rename "View Xpub address" to "Private View Key" for Pirate Chain and Zcash
- fixed: Private view key modal warning text for other currencies besides Monero
- fixed: Handle unhandled promises
- fixed: Wallet list row sync circle component recycling
- fixed: Missing wallet migration transaction metadata
- fixed: Enabling tokens from wallet list row now relies on tokenId rather than parent currency code
- fixed: Deleted account name no longer persists on PIN screen
- fixed: Inability to select preferred swap provider in settings
- fixed: Various visual, UX, and text issues
- Upgrade edge-core-js v1.3.6
- fixed: Interpret HTTP 418 responses from the CORS proxy as errors.
- changed: Remove fetch fallback logic. No proxy servers will be used.
- changed: The fetchCors method is no longer deprecated. Use this if CORS might be an issue. Do not use this for any secrets or credentials.
- fixed: Escape bridge strings closer to serialization, for possibly better performance.
- fixed: Fallback to CORS-safe fetch functions on all errors to fix inconsistency with error messages across platforms.
- changed: Add fallback to bridged fetch if request to edge-cors-proxy server fails.
- changed: Added a fallback to edge-cors-proxy server to fetch method on EdgeIo.
- fixed: Enable WebView debugging on iOS 16.4+
- fixed: Correctly return transactions after a resync.
- Upgrade edge-currency-accountbased to v1.4.11
- fixed: Use io.fetchCors for all requests, instead of io.fetch.
- fixed: Replace asMaybe and asOptional cleaner default objects with functions that return new objects in otherData cleaners
- changed: Update XRP explorer url
- changed: Update checkpoints
- Optimism: Replace deprecated rpc method rollup_gasPrices with l1BaseFee query
- EVM: Handle null gas parameter in WalletConnect requests
- FIO: Treat 403 status code as error
- Fixed: FIO transaction reliability issues resolved by adding more historical nodes
- Update GALA token
- Remove EthGasStation test
- Upgrade edge-currency-plugins to v2.0.4
- Fixed: Race condition during re-sync causing impartial processor data ("Missing processor address" bug)
- Fixed: Throw DustSpendError instead of obscure blockbook error message for dust spend transaction broadcasts.
- Upgrade edge exchange plugins to v0.19.8
- Use EdgeIo.fetchCors for all requests
- Swapuz/LetsExchange: Disable MATH
- Fixed: Increased gas limit by 40% for all chains for LI.FI
- Upgrade edge-login-ui-rn to v2.6.5
- fixed: Correctly handle errors during account creation.
- fixed: Allow biometric logins for light accounts.
- changed: Update password login to allow configurable account creation options
- fixed: Don't clear modals upon unmounting UpgradeUsernameScreen
- changed: Update translations
- fixed: Stop returning the incorrect keychain data for light accounts.
- fixed: Update the wording on the new light account PIN scene, since there is no password.
- fixed: Update the terms & conditions wording for light accounts, which have no password.
- fixed: Reinstate login screen back button, conditionalize light username-less vs full account creation
- added: Accept an initialLoginId prop for the LoginScreen. Use this to select the initial user.
- deprecated: The username prop for the LoginScreen. Use initialLoginId instead.
- fixed: Enable the username dropdown for > 0 saved users on the password login scene
- fixed: Password login scene user list dropdown fade covering last entry
- fixed: Unnecessary scene scrolling in password login scene
- fixed: Add missing gradient in Password Login Scene scrollable list
- fixed: Allow text wrapping in PIN Login Scene account dropdown list
- changed: Update translations
- changed: Upgrade to edge-core-js v1.3.2.
- changed: Support for username-less (light) account.
- fixed: Correctly handle username deletion on the PIN scene.
- fixed: Maestro testing targetability of components
- changed: Update password login scene to use themed text input
- fixed: Password login scene errors were not localized
- changed: Allow biometric logins for accounts without usernames.

## 3.13.0

- Add WalletConnect v2 support
Expand Down
Binary file modified android/app/src/main/assets/fonts/custom.ttf
Binary file not shown.
15 changes: 7 additions & 8 deletions ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -62,27 +62,26 @@ target 'edge' do

pod 'RNVectorIcons', :path => '../node_modules/react-native-vector-icons'

# Permissions
# Permissions:
permissions_path = '../node_modules/react-native-permissions/ios'

pod 'Permission-Camera', :path => "#{permissions_path}/Camera"
pod 'Permission-Contacts', :path => "#{permissions_path}/Contacts"
pod 'Permission-LocationAccuracy', :path => "#{permissions_path}/LocationAccuracy"
pod 'Permission-LocationAlways', :path => "#{permissions_path}/LocationAlways"
pod 'Permission-LocationWhenInUse', :path => "#{permissions_path}/LocationWhenInUse"
pod 'Permission-Notifications', :path => "#{permissions_path}/Notifications"

# Necessary for Zcash and Piratechain
pod 'react-native-zcash', :path => '../node_modules/react-native-zcash'
pod 'react-native-piratechain', :path => '../node_modules/react-native-piratechain'
# Zcash transitive dependency:
pod 'CGRPCZlib', :modular_headers => true
pod 'CNIOAtomics', :modular_headers => true
pod 'CNIOBoringSSL', :modular_headers => true
pod 'CNIOBoringSSLShims', :modular_headers => true
pod 'CNIOLinux', :modular_headers => true
pod 'CNIODarwin', :modular_headers => true
pod 'CNIOHTTPParser', :modular_headers => true
pod 'CNIOLinux', :modular_headers => true
pod 'CNIOWindows', :modular_headers => true
pod 'CGRPCZlib', :modular_headers => true
pod 'ZcashLightClientKit', :git => 'https://github.com/EdgeApp/ZcashLightClientKit.git', :commit => 'c36c79c3d3cfdfc01054795d834d1742d1a7914d'

# Piratechain:
pod 'react-native-piratechain', :path => '../node_modules/react-native-piratechain'
pod 'PirateLightClientKit', :git => 'https://github.com/PirateNetwork/PirateLightClientKit.git', :commit => 'f939db082643d73cead7172da0a862f3b3df34a9'
end
45 changes: 19 additions & 26 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ PODS:
- disklet (0.5.2):
- React
- DoubleConversion (1.1.6)
- edge-core-js (1.3.6):
- edge-core-js (1.4.1):
- React-Core
- edge-currency-accountbased (1.4.11):
- edge-currency-accountbased (1.5.2):
- React-Core
- edge-login-ui-rn (2.6.6):
- edge-login-ui-rn (2.7.0):
- React
- FBLazyVector (0.71.11)
- FBReactNativeSpec (0.71.11):
Expand Down Expand Up @@ -199,7 +199,6 @@ PODS:
- libwebp/mux (1.2.1):
- libwebp/demux
- libwebp/webp (1.2.1)
- libzcashlc (0.0.3)
- Logging (1.4.0)
- nanopb (2.30908.0):
- nanopb/decode (= 2.30908.0)
Expand Down Expand Up @@ -493,6 +492,9 @@ PODS:
- React-Core
- react-native-in-app-review (4.3.3):
- React-Core
- react-native-is-maestro (2.1.0):
- RCT-Folly (= 2021.07.22.00)
- React-Core
- react-native-mail (6.1.1):
- React-Core
- react-native-mymonero-core (0.3.1):
Expand All @@ -515,9 +517,10 @@ PODS:
- React-Core
- react-native-webview (13.2.2):
- React-Core
- react-native-zcash (0.3.3):
- React
- ZcashLightClientKit (= 0.14.0-beta)
- react-native-zcash (0.3.5):
- gRPC-Swift (~> 1.0)
- React-Core
- SQLite.swift (~> 0.12)
- React-perflogger (0.71.11)
- React-RCTActionSheet (0.71.11):
- React-Core/RCTActionSheetHeaders (= 0.71.11)
Expand Down Expand Up @@ -784,10 +787,6 @@ PODS:
- Yoga (1.14.0)
- YogaKit (1.18.1):
- Yoga (~> 1.14)
- ZcashLightClientKit (0.14.0-beta):
- gRPC-Swift (~> 1.0)
- libzcashlc (= 0.0.3)
- SQLite.swift (~> 0.12.2)
- ZXingObjC (3.6.5):
- ZXingObjC/All (= 3.6.5)
- ZXingObjC/All (3.6.5)
Expand Down Expand Up @@ -865,6 +864,7 @@ DEPENDENCIES:
- react-native-get-random-values (from `../node_modules/react-native-get-random-values`)
- react-native-image-picker (from `../node_modules/react-native-image-picker`)
- react-native-in-app-review (from `../node_modules/react-native-in-app-review`)
- react-native-is-maestro (from `../node_modules/react-native-is-maestro`)
- 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`)"
Expand Down Expand Up @@ -915,7 +915,6 @@ DEPENDENCIES:
- RNSVG (from `../node_modules/react-native-svg`)
- RNVectorIcons (from `../node_modules/react-native-vector-icons`)
- Yoga (from `../node_modules/react-native/ReactCommon/yoga`)
- ZcashLightClientKit (from `https://github.com/EdgeApp/ZcashLightClientKit.git`, commit `c36c79c3d3cfdfc01054795d834d1742d1a7914d`)

SPEC REPOS:
trunk:
Expand Down Expand Up @@ -954,7 +953,6 @@ SPEC REPOS:
- libevent
- libpiratelc
- libwebp
- libzcashlc
- Logging
- nanopb
- OpenSSL-Universal
Expand Down Expand Up @@ -1060,6 +1058,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native-image-picker"
react-native-in-app-review:
:path: "../node_modules/react-native-in-app-review"
react-native-is-maestro:
:path: "../node_modules/react-native-is-maestro"
react-native-mail:
:path: "../node_modules/react-native-mail"
react-native-mymonero-core:
Expand Down Expand Up @@ -1160,17 +1160,11 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native-vector-icons"
Yoga:
:path: "../node_modules/react-native/ReactCommon/yoga"
ZcashLightClientKit:
:commit: c36c79c3d3cfdfc01054795d834d1742d1a7914d
:git: https://github.com/EdgeApp/ZcashLightClientKit.git

CHECKOUT OPTIONS:
PirateLightClientKit:
:commit: f939db082643d73cead7172da0a862f3b3df34a9
:git: https://github.com/PirateNetwork/PirateLightClientKit.git
ZcashLightClientKit:
:commit: c36c79c3d3cfdfc01054795d834d1742d1a7914d
:git: https://github.com/EdgeApp/ZcashLightClientKit.git

SPEC CHECKSUMS:
_NIODataStructures: e2077c7dc7c1d6c93e698c85fe04d663a17f53a4
Expand All @@ -1188,9 +1182,9 @@ SPEC CHECKSUMS:
CocoaAsyncSocket: 065fd1e645c7abab64f7a6a2007a48038fdc6a99
disklet: e7ed3e673ccad9d175a1675f9f3589ffbf69a5fd
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
edge-core-js: 1691cc53dce8bab2e04c44ccf74c837eee1ea462
edge-currency-accountbased: ce9b39cc0413ecc4ac14040d3ce9e12280672e67
edge-login-ui-rn: a1d8d281819e235bcd97f61cf69f94a42db854eb
edge-core-js: 8fedecef2b0a09b32fd0a44de7c82c75943cfad3
edge-currency-accountbased: 4dfe7753cc360c8b6f2a925251b7e0e9db8554a5
edge-login-ui-rn: 20ee19ab6c5036b5ee159f0e40b215e16e8a7952
FBLazyVector: c511d4cd0210f416cb5c289bd5ae6b36d909b048
FBReactNativeSpec: a911fb22def57aef1d74215e8b6b8761d25c1c54
Firebase: 5f8193dff4b5b7c5d5ef72ae54bb76c08e2b841d
Expand Down Expand Up @@ -1220,7 +1214,6 @@ SPEC CHECKSUMS:
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
libpiratelc: 8b923888cb473667fb7a84fa9b590e95a57f8a3d
libwebp: 98a37e597e40bfdb4c911fc98f2c53d0b12d05fc
libzcashlc: 1dfab6ecf157d60e58349906842f370bc65a5962
Logging: beeb016c9c80cf77042d62e83495816847ef108b
nanopb: a0ba3315591a9ae0a16a309ee504766e90db0c96
OpenSSL-Universal: ebc357f1e6bc71fa463ccb2fe676756aff50e88c
Expand Down Expand Up @@ -1252,6 +1245,7 @@ SPEC CHECKSUMS:
react-native-get-random-values: dee677497c6a740b71e5612e8dbd83e7539ed5bb
react-native-image-picker: db60857e03d63721f19b6f4027de20429ddd9cba
react-native-in-app-review: db8bb167a5f238e7ceca5c242d6b36ce8c4404a4
react-native-is-maestro: b1e44ada6a8dbaf6b2e0b112bd381d5dd9d35d67
react-native-mail: 8fdcd3aef007c33a6877a18eb4cf7447a1d4ce4a
react-native-mymonero-core: 780bf854f27a0a905bcef5e7757d2de0a15b4408
react-native-netinfo: 3671b091c4843fda5e153612866ef4024b8f5d62
Expand All @@ -1260,7 +1254,7 @@ SPEC CHECKSUMS:
react-native-safe-area-context: 68b07eabfb0d14547d36f6929c0e98d818064f02
react-native-tcp-socket: e724380c910c2e704816ec817ed28f1342246ff7
react-native-webview: b8ec89966713985111a14d6e4bf98d8b54bced0d
react-native-zcash: 173a2c8148aed6d7a5ec0867b19279dff938942e
react-native-zcash: 4b57bcc0e64437b8c5d6a228d0db4648aaaacc9b
React-perflogger: e706562ab7eb8eb590aa83a224d26fa13963d7f2
React-RCTActionSheet: 57d4bd98122f557479a3359ad5dad8e109e20c5a
React-RCTAnimation: ccf3ef00101ea74bda73a045d79a658b36728a60
Expand Down Expand Up @@ -1321,9 +1315,8 @@ SPEC CHECKSUMS:
SwiftProtobuf: b02b5075dcf60c9f5f403000b3b0c202a11b6ae1
Yoga: f7decafdc5e8c125e6fa0da38a687e35238420fa
YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
ZcashLightClientKit: a6c9db6327f05e2d095f10412c581d53dae32f85
ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb

PODFILE CHECKSUM: 7ba9324537c08a5d3632b7d4a9f3a8fd648b0063
PODFILE CHECKSUM: b8006b1d677c7c684b18986cd606d6adc03317b0

COCOAPODS: 1.12.1
20 changes: 10 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "edge-react-gui",
"version": "3.15.0",
"version": "3.16.0",
"private": true,
"description": "Edge Wallet React GUI",
"homepage": "https://edge.app",
Expand Down Expand Up @@ -43,9 +43,8 @@
"maestro": "node -r sucrase/register ./scripts/runMaestro.ts test",
"maestro:ios": "node -r sucrase/register ./scripts/runMaestro.ts test --include-tags all,ios maestro",
"maestro:android": "node -r sucrase/register ./scripts/runMaestro.ts test --include-tags all,android maestro",
"copy-checkpoints": "cp -r node_modules/edge-currency-accountbased/android/src/main/assets/saplingtree/mainnet ios/Pods/ZcashLightClientKit/Sources/ZcashLightClientKit/Resources/saplingtree-checkpoints && cp -r node_modules/edge-currency-accountbased/android/src/main/assets/piratesaplingtree/mainnet ios/Pods/PirateLightClientKit/Sources/PirateLightClientKit/Resources/piratesaplingtree-checkpoints",
"precommit": "npm run localize && lint-staged && tsc && npm test",
"prepare.ios": "(cd ios; pod repo update; pod install) && npm run copy-checkpoints",
"prepare.ios": "(cd ios; pod repo update; pod install)",
"prepare": "husky install && ./scripts/prepare.sh",
"server": "node ./loggingServer.js",
"start.plugins": "webpack serve",
Expand Down Expand Up @@ -140,12 +139,12 @@
"deepmerge": "^4.3.1",
"detect-bundler": "^1.1.0",
"disklet": "^0.5.2",
"edge-core-js": "^1.3.6",
"edge-currency-accountbased": "^1.4.11",
"edge-currency-monero": "^1.0.0",
"edge-currency-plugins": "^2.0.4",
"edge-exchange-plugins": "^0.19.8",
"edge-login-ui-rn": "^2.6.6",
"edge-core-js": "^1.4.1",
"edge-currency-accountbased": "^1.5.2",
"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",
"ethers": "^5.6.0",
"paraswap": "^5.2.0",
"prompts": "^2.4.2",
Expand All @@ -170,6 +169,7 @@
"react-native-haptic-feedback": "^1.14.0",
"react-native-image-picker": "^5.6.0",
"react-native-in-app-review": "^4.3.3",
"react-native-is-maestro": "^2.1.0",
"react-native-keyboard-aware-scroll-view": "^0.9.5",
"react-native-linear-gradient": "^2.5.6",
"react-native-localize": "^3.0.2",
Expand All @@ -190,7 +190,7 @@
"react-native-tcp-socket": "^6.0.6",
"react-native-vector-icons": "^7.1.0",
"react-native-webview": "^13.2.2",
"react-native-zcash": "^0.3.3",
"react-native-zcash": "^0.3.5",
"react-redux": "^8.1.1",
"redux": "^4.2.1",
"redux-flipper": "^2.0.1",
Expand Down
2 changes: 1 addition & 1 deletion src/__tests__/__snapshots__/GuiPlugins.test.ts.snap
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ exports[`Production plugin data Sell plugins match snapshot on iOS + US 1`] = `
"deepPath": "",
"deepQuery": {},
"description": "Fee: 4-5% / Settlement: 1 - 4 days",
"partnerIconPath": "icon_black_small.png",
"partnerIconPath": "moonpay_symbol_prp.png",
"paymentTypeLogoKey": "bank",
"paymentTypes": [
"credit",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ exports[`BuyCrypto should render with some props 1`] = `
"text": undefined,
}
}
accessible={true}
accessible={false}
collapsable={false}
focusable={true}
onClick={[Function]}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ exports[`PromoCard should render 1`] = `
"text": undefined,
}
}
accessible={true}
accessible={false}
collapsable={false}
focusable={true}
onClick={[Function]}
Expand Down Expand Up @@ -104,6 +104,7 @@ exports[`PromoCard should render 1`] = `
null,
]
}
testID="promoCard"
>
Show me
</Text>
Expand All @@ -125,7 +126,7 @@ exports[`PromoCard should render 1`] = `
"text": undefined,
}
}
accessible={true}
accessible={false}
collapsable={false}
focusable={true}
onClick={[Function]}
Expand Down Expand Up @@ -161,6 +162,7 @@ exports[`PromoCard should render 1`] = `
{},
]
}
testID="closePromo"
>
</Text>
Expand Down
Loading

0 comments on commit 77d3184

Please sign in to comment.