Skip to content

Commit 5aa1be9

Browse files
committed
Merge branch 'staging'
2 parents b29ce84 + 5d15e13 commit 5aa1be9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+2515
-676
lines changed

CHANGELOG.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,24 @@
22

33
## Unreleased (develop)
44

5+
## 4.29.0 (staging)
6+
57
- added: Add eCash.
8+
- added: Thorchain TCY stake and unstake
9+
- added: Add Fantom to Sonic bridge
10+
- added: Use `getTokenDetails` to auto-complete fields in `EditTokenScene`
611
- added: Toast notifications for PIN changes.
12+
- added: Scam warning to camera access request modal
713
- changed: Auto launch QR scanner for multi-out payments if previously used
814
- changed: Auto populate amount for multi-out payments if prior amounts are similar
915
- changed: Auto scroll to end of `SendScene2` when addresses or amounts change
16+
- changed: Improved unlock settings UX by removing the extra tap required after successfully unlocking settings
17+
- changed: Show Thorchain Savers positions associated with bech32 addresses
18+
- fixed: Disable save button in spending limits scene when transaction value is not set
19+
- fixed: Fix regex for Paybis min/max amounts
1020
- fixed: No longer show FIO onboarding modal while in Duress Mode.
1121
- fixed: Prevent pin changes which match duress pin.
22+
- fixed: Show deprecated stake policies with allocations
1223

1324
## 4.28.1 (2025-05-28)
1425

@@ -23,13 +34,14 @@
2334
- added: Add os version to the "OS" line of logs
2435
- added: Informative fiat currency support errors when requesting Moonpay quotes
2536
- changed: "MAX" button in `FlipInput` restyled to tertiary and moved next to the text input field
26-
- fixed: Incorrect type assumptions between `amountQuotePlugin` and `pluginUtils` for error parsing
37+
- changed: Moved spending limits settings to password-locked account settings section.
2738
- fixed: Primary button transforming on the animation on `GettingStartedScene`
2839
- fixed: `NotificationCenterScene` could crash if there was an undismissed new token notification and the associated wallet no longer existed
40+
- removed: Disable Fantom transaction list
41+
- fixed: Refresh the tranaction list on resync
2942
- fixed: Show the correct username in the "Forget Account" modal.
3043
- fixed: `TransactionListRow` missing timestamp while syncing
3144
- fixed: Don't show required text for optional import options
32-
- removed: Disable Fantom transaction list
3345

3446
## 4.27.2 (2025-05-13)
3547

ios/Podfile.lock

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ PODS:
1515
- disklet (0.5.2):
1616
- React
1717
- DoubleConversion (1.1.6)
18-
- edge-core-js (2.27.4):
18+
- edge-core-js (2.31.1):
1919
- React-Core
20-
- edge-currency-accountbased (4.47.2):
20+
- edge-currency-accountbased (4.48.3):
2121
- React-Core
22-
- edge-currency-plugins (3.7.0):
22+
- edge-currency-plugins (3.8.2):
2323
- React-Core
24-
- edge-exchange-plugins (2.23.1):
24+
- edge-exchange-plugins (2.25.2):
2525
- React-Core
26-
- edge-login-ui-rn (3.26.1):
26+
- edge-login-ui-rn (3.27.1):
2727
- React-Core
2828
- EXApplication (5.1.1):
2929
- ExpoModulesCore
@@ -418,13 +418,13 @@ PODS:
418418
- React-Core
419419
- react-native-mail (6.1.1):
420420
- React-Core
421-
- react-native-mymonero-core (0.3.1):
421+
- react-native-mymonero-core (0.3.2):
422422
- React-Core
423423
- react-native-netinfo (9.0.0):
424424
- React-Core
425425
- react-native-performance (5.1.2):
426426
- React-Core
427-
- react-native-piratechain (0.5.9):
427+
- react-native-piratechain (0.5.10):
428428
- gRPC-Swift (~> 1.8)
429429
- MnemonicSwift (~> 2.2)
430430
- React-Core
@@ -436,7 +436,7 @@ PODS:
436436
- react-native-webview (13.8.4):
437437
- RCT-Folly (= 2021.07.22.00)
438438
- React-Core
439-
- react-native-zano (0.1.3):
439+
- react-native-zano (0.2.0):
440440
- OpenSSL-Universal
441441
- React-Core
442442
- react-native-zcash (0.9.7):
@@ -1096,11 +1096,11 @@ SPEC CHECKSUMS:
10961096
CNIOWindows: 3047f2d8165848a3936a0a755fee27c6b5ee479b
10971097
disklet: 8a20bf8a568635b6e6bb8f93297dac13ee5cef98
10981098
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
1099-
edge-core-js: d9378689e1b7304e34a001731fdcbd6affde665f
1100-
edge-currency-accountbased: 00b7d41c31309aec27feb8753660f89b783fabc2
1101-
edge-currency-plugins: f9fe0c22b0fa3cea0989c36e657a0f5d461552c5
1102-
edge-exchange-plugins: 14ccf6f1398e7272afb19018be51d8a0c60952c9
1103-
edge-login-ui-rn: 91b4cfca94bc40f6020c88de7580fe1613229832
1099+
edge-core-js: f20da4858c4ad38adf5a7eefa53a55966fd04b5e
1100+
edge-currency-accountbased: 7d6a886a23fb852b8c1b5582a13ea1f70f403d84
1101+
edge-currency-plugins: 895640df32689491d4f23db2a15237a99cd0a4f8
1102+
edge-exchange-plugins: 6a50863447b52dd27e48a8572e6ba55dcd0eaf64
1103+
edge-login-ui-rn: f4b7bada9346ec86e215e5328dd1606d37f0bc27
11041104
EXApplication: 9e02dde69a11d17d394bc89a9ea90c619217bada
11051105
EXConstants: 0a70495c8b5dff454903ed9e798dbb39da9c3fd7
11061106
EXFileSystem: 6c8c6df1f092c49cbbb97df4273eee3b619369b9
@@ -1152,14 +1152,14 @@ SPEC CHECKSUMS:
11521152
react-native-in-app-review: b3d1eed3d1596ebf6539804778272c4c65e4a400
11531153
react-native-keyboard-controller: d7eb26730f87cc9b27e8998dd0491a8a4da98c45
11541154
react-native-mail: 6e83813066984b26403d3fdfe79ac7bb31857e3c
1155-
react-native-mymonero-core: d22cfc9d1107daf6aab7c1631071c760509c068c
1155+
react-native-mymonero-core: ea591a13d86ce9fec558f1f9d7c0d5f23e46d20d
11561156
react-native-netinfo: 8fa5cbcb4a8e69e265ff685b9e54c175ef2bbd40
11571157
react-native-performance: 125a96c145e29918b55b45ce25cbba54f1e24dcd
1158-
react-native-piratechain: 27b3b40fbe3a8799e92a2482c3561d9b26d1a3b9
1158+
react-native-piratechain: 45b65cf0f3ecbc994d66962514d80f6b5248f04f
11591159
react-native-safari-view: 07dc856a2663fef31eaca6beb79b111b8f6cf1f2
11601160
react-native-safe-area-context: 8c70551c8688cd584a53487aa1b9361e991a3b4a
11611161
react-native-webview: eb98d9d9c956ebeae58bff20cbe09fb92cd75ffb
1162-
react-native-zano: 03c3a94b1c06702b388ff32406a23c2755c88852
1162+
react-native-zano: 731461ef5fbcf8bb9f46de940a63c095846bcf6c
11631163
react-native-zcash: 2ad9869faa35580ece8ee62ae5d584b7459b9af7
11641164
React-perflogger: 0cc42978a483a47f3696171dac2e7033936fc82d
11651165
React-RCTActionSheet: ea922b476d24f6d40b8e02ac3228412bd3637468

jest.config.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@ module.exports = {
22
moduleFileExtensions: ['js', 'json', 'jsx', 'ts', 'tsx'],
33
moduleNameMapper: {
44
// Force module uuid to resolve with the CJS entry point, because Jest does not support package.json.exports. See https://github.com/uuidjs/uuid/issues/451
5-
uuid: require.resolve('uuid')
5+
uuid: require.resolve('uuid'),
6+
// We want the Node.js version of edge-core-js, not the RN one:
7+
'edge-core-js': require.resolve('edge-core-js')
68
},
79
preset: 'react-native',
810
setupFiles: ['./jestSetup.js'],

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "edge-react-gui",
3-
"version": "4.28.1",
3+
"version": "4.29.0",
44
"private": true,
55
"description": "Edge Wallet React GUI",
66
"homepage": "https://edge.app",
@@ -98,13 +98,13 @@
9898
"deepmerge": "^4.3.1",
9999
"detect-bundler": "^1.1.0",
100100
"disklet": "^0.5.2",
101-
"edge-core-js": "^2.27.4",
102-
"edge-currency-accountbased": "4.47.2",
101+
"edge-core-js": "^2.31.1",
102+
"edge-currency-accountbased": "^4.48.3",
103103
"edge-currency-monero": "^1.5.0",
104-
"edge-currency-plugins": "^3.7.0",
105-
"edge-exchange-plugins": "^2.23.1",
104+
"edge-currency-plugins": "^3.8.2",
105+
"edge-exchange-plugins": "^2.25.2",
106106
"edge-info-server": "^3.8.0",
107-
"edge-login-ui-rn": "^3.26.1",
107+
"edge-login-ui-rn": "^3.27.1",
108108
"ethers": "^5.7.2",
109109
"expo": "^48.0.0",
110110
"jsrsasign": "^11.1.0",
@@ -141,10 +141,10 @@
141141
"react-native-linear-gradient": "^2.8.3",
142142
"react-native-localize": "^3.1.0",
143143
"react-native-mail": "^6.1.1",
144-
"react-native-mymonero-core": "^0.3.1",
144+
"react-native-mymonero-core": "^0.3.2",
145145
"react-native-patina": "^0.1.6",
146146
"react-native-permissions": "^4.1.5",
147-
"react-native-piratechain": "^0.5.9",
147+
"react-native-piratechain": "^0.5.10",
148148
"react-native-reanimated": "^3.14.0",
149149
"react-native-reorderable-list": "^0.5.0",
150150
"react-native-safari-view": "^2.1.0",
@@ -159,7 +159,7 @@
159159
"react-native-vector-icons": "^10.1.0",
160160
"react-native-webview": "^13.8.4",
161161
"react-native-wheel-picker-android": "^2.0.6",
162-
"react-native-zano": "^0.1.3",
162+
"react-native-zano": "^0.2.0",
163163
"react-native-zcash": "^0.9.7",
164164
"react-redux": "^8.1.1",
165165
"redux": "^4.2.1",

patches/react-native-piratechain+0.5.7.patch

Lines changed: 0 additions & 151 deletions
This file was deleted.

0 commit comments

Comments
 (0)