Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit d7b12df

Browse files
swansontecswansontec
committed
Merge branch 'staging'
2 parents e16c8f1 + 0d1e1e3 commit d7b12df

File tree

115 files changed

+2497
-1735
lines changed

Some content is hidden

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

115 files changed

+2497
-1735
lines changed

‎CHANGELOG.md‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,29 @@
22

33
## Unreleased (develop)
44

5-
## 4.31.0 (staging)
5+
- added: `ReturnKeyTypeButton` to `FlipInputModal2`
6+
7+
## 4.32.0 (staging)
8+
9+
- added: Support for Paybis ACH buy
10+
- added: Private View Key wallet menu option for Zano
11+
- added: Support for `SwapBelowLimitError` and `SwapAboveLimitError` without limit amount props
12+
- added: `ReturnKeyTypeButton` to `FlipInputModal2`
13+
- changed: Reinstate "Sell" in `MenuTabs` for UK
14+
- changed: `NotificationCard` visibility rules updated to be less invasive
15+
- changed: Unsupported FIO assets removed from `ConnectWallets` and `ShareButtons`
16+
- changed: `WalletListMenuModal` now supports displaying loading states for async options
17+
- fixed: Fixed viewport issues on ChnageMiningFeeScene.
18+
- fixed: Account for minimum account balances when migrating/sweeping
19+
- fixed: Button UI styling in `MigrateWalletCompletionScene`
20+
- fixed: Map from FIO codes to Edge-supported currencies more correctly
21+
- remove: Wire transfer fiat buy
22+
23+
## 4.31.0 (2025-07-07)
624

725
- added: "Change Username" setting
826
- added: Support for Zano alias name resolution.
27+
- added: Add `walletAddress` param to Moonpay buy quotes.
928
- changed: Don't allow multiple pending EVM transactions.
1029
- fixed: Specify build target in deploy.ts to fix Apple silicon build environments
1130
- fixed: Maestro tests to successfully run again

‎ios/Podfile.lock‎

Lines changed: 50 additions & 50 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.32.0):
18+
- edge-core-js (2.32.1):
1919
- React-Core
20-
- edge-currency-accountbased (4.52.2):
20+
- edge-currency-accountbased (4.54.0):
2121
- React-Core
22-
- edge-currency-plugins (3.8.2):
22+
- edge-currency-plugins (3.8.3):
2323
- React-Core
24-
- edge-exchange-plugins (2.26.0):
24+
- edge-exchange-plugins (2.28.0):
2525
- React-Core
26-
- edge-login-ui-rn (3.28.0):
26+
- edge-login-ui-rn (3.28.1):
2727
- React-Core
2828
- EXApplication (5.1.1):
2929
- ExpoModulesCore
@@ -49,25 +49,25 @@ PODS:
4949
- React-Core (= 0.71.15)
5050
- React-jsi (= 0.71.15)
5151
- ReactCommon/turbomodule/core (= 0.71.15)
52-
- Firebase/CoreOnly (10.27.0):
53-
- FirebaseCore (= 10.27.0)
54-
- Firebase/Messaging (10.27.0):
52+
- Firebase/CoreOnly (10.29.0):
53+
- FirebaseCore (= 10.29.0)
54+
- Firebase/Messaging (10.29.0):
5555
- Firebase/CoreOnly
56-
- FirebaseMessaging (~> 10.27.0)
57-
- FirebaseCore (10.27.0):
56+
- FirebaseMessaging (~> 10.29.0)
57+
- FirebaseCore (10.29.0):
5858
- FirebaseCoreInternal (~> 10.0)
5959
- GoogleUtilities/Environment (~> 7.12)
6060
- GoogleUtilities/Logger (~> 7.12)
6161
- FirebaseCoreExtension (10.27.0):
6262
- FirebaseCore (~> 10.0)
63-
- FirebaseCoreInternal (10.27.0):
63+
- FirebaseCoreInternal (10.29.0):
6464
- "GoogleUtilities/NSData+zlib (~> 7.8)"
65-
- FirebaseInstallations (10.27.0):
65+
- FirebaseInstallations (10.29.0):
6666
- FirebaseCore (~> 10.0)
6767
- GoogleUtilities/Environment (~> 7.8)
6868
- GoogleUtilities/UserDefaults (~> 7.8)
6969
- PromisesObjC (~> 2.1)
70-
- FirebaseMessaging (10.27.0):
70+
- FirebaseMessaging (10.29.0):
7171
- FirebaseCore (~> 10.0)
7272
- FirebaseInstallations (~> 10.0)
7373
- GoogleDataTransport (~> 9.3)
@@ -119,7 +119,7 @@ PODS:
119119
- hermes-engine (0.71.15):
120120
- hermes-engine/Pre-built (= 0.71.15)
121121
- hermes-engine/Pre-built (0.71.15)
122-
- ImageColors (2.3.0):
122+
- ImageColors (2.4.0):
123123
- ExpoModulesCore
124124
- libevent (2.1.12)
125125
- libwebp (1.3.2):
@@ -407,14 +407,14 @@ PODS:
407407
- react-native-compat (2.11.0):
408408
- RCT-Folly (= 2021.07.22.00)
409409
- React-Core
410-
- react-native-contacts (7.0.4):
410+
- react-native-contacts (8.0.5):
411411
- React-Core
412-
- react-native-get-random-values (1.9.0):
412+
- react-native-get-random-values (1.11.0):
413413
- React-Core
414414
- react-native-image-picker (7.1.2):
415415
- RCT-Folly (= 2021.07.22.00)
416416
- React-Core
417-
- react-native-in-app-review (4.3.3):
417+
- react-native-in-app-review (4.3.5):
418418
- React-Core
419419
- react-native-keyboard-controller (1.10.2):
420420
- React-Core
@@ -539,23 +539,23 @@ PODS:
539539
- React-Core
540540
- RNCAsyncStorage (1.19.4):
541541
- React-Core
542-
- RNCClipboard (1.14.1):
542+
- RNCClipboard (1.16.3):
543543
- React-Core
544544
- RNCPicker (2.4.0):
545545
- React-Core
546546
- RNDateTimePicker (7.2.0):
547547
- React-Core
548548
- RNDeviceInfo (13.2.0):
549549
- React-Core
550-
- RNFastImage (8.5.11):
550+
- RNFastImage (8.6.3):
551551
- React-Core
552552
- SDWebImage (~> 5.11.1)
553553
- SDWebImageWebPCoder (~> 0.8.4)
554-
- RNFBApp (20.1.0):
555-
- Firebase/CoreOnly (= 10.27.0)
554+
- RNFBApp (20.5.0):
555+
- Firebase/CoreOnly (= 10.29.0)
556556
- React-Core
557-
- RNFBMessaging (20.1.0):
558-
- Firebase/Messaging (= 10.27.0)
557+
- RNFBMessaging (20.5.0):
558+
- Firebase/Messaging (= 10.29.0)
559559
- FirebaseCoreExtension
560560
- React-Core
561561
- RNFBApp
@@ -564,11 +564,11 @@ PODS:
564564
- RNGestureHandler (2.16.0):
565565
- RCT-Folly (= 2021.07.22.00)
566566
- React-Core
567-
- RNLocalize (3.1.0):
567+
- RNLocalize (3.4.2):
568568
- React-Core
569569
- RNPermissions (4.1.5):
570570
- React-Core
571-
- RNQrGenerator (1.3.1):
571+
- RNQrGenerator (1.4.4):
572572
- React
573573
- ZXingObjC
574574
- RNReactNativeHapticFeedback (1.14.0):
@@ -597,7 +597,7 @@ PODS:
597597
- RNSound/Core (= 0.11.0)
598598
- RNSound/Core (0.11.0):
599599
- React
600-
- RNStoreReview (0.4.1):
600+
- RNStoreReview (0.4.3):
601601
- React-Core
602602
- RNSVG (15.3.0):
603603
- React-Core
@@ -1101,12 +1101,12 @@ SPEC CHECKSUMS:
11011101
CNIOLinux: 62e3505f50de558c393dc2f273dde71dcce518da
11021102
CNIOWindows: 3047f2d8165848a3936a0a755fee27c6b5ee479b
11031103
disklet: 8a20bf8a568635b6e6bb8f93297dac13ee5cef98
1104-
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
1105-
edge-core-js: 232e3af1fcb056851ebd1e18851aded94e1639d0
1106-
edge-currency-accountbased: 8a358852c482c1475e527311210b7ba371344dd3
1107-
edge-currency-plugins: 895640df32689491d4f23db2a15237a99cd0a4f8
1108-
edge-exchange-plugins: 68c5e673d327f9231b5efbc9e7af98833da6579e
1109-
edge-login-ui-rn: c1f0abd361d4692797ec5d6b104496c23d22b940
1104+
DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953
1105+
edge-core-js: ffcf601be0aeac872ae25194dbe344762bc0d97a
1106+
edge-currency-accountbased: ba66940b4522764d49a7cd484021cdb147ee8c48
1107+
edge-currency-plugins: 119e0c65e8db146b02e1df82f2e0915c3fa12f05
1108+
edge-exchange-plugins: 4bfb156ecba6d0821fcd341a5236ead1dae78566
1109+
edge-login-ui-rn: bc0ac2a372b9878fc34e467ff0f43af65b2ba4a1
11101110
EXApplication: 9e02dde69a11d17d394bc89a9ea90c619217bada
11111111
EXConstants: 0a70495c8b5dff454903ed9e798dbb39da9c3fd7
11121112
EXFileSystem: 6c8c6df1f092c49cbbb97df4273eee3b619369b9
@@ -1116,27 +1116,27 @@ SPEC CHECKSUMS:
11161116
ExpoModulesCore: 57b9b1b34195cd7c70e20b649934c37509988926
11171117
FBLazyVector: d06bbe89e3a89ee90c4deab1c84bf306ffa5ed37
11181118
FBReactNativeSpec: d5d9871fe5c4b61787a3aed4f9e5529908e22069
1119-
Firebase: 26b040b20866a55f55eb3611b9fcf3ae64816b86
1120-
FirebaseCore: a2b95ae4ce7c83ceecfbbbe3b6f1cddc7415a808
1119+
Firebase: cec914dab6fd7b1bd8ab56ea07ce4e03dd251c2d
1120+
FirebaseCore: 30e9c1cbe3d38f5f5e75f48bfcea87d7c358ec16
11211121
FirebaseCoreExtension: 4ec89dd0c6de93d6becde32122d68b7c35f6bf5d
1122-
FirebaseCoreInternal: 4b297a2d56063dbea2c1d0d04222d44a8d058862
1123-
FirebaseInstallations: 766dabca09fd94aef922538aaf144cc4a6fb6869
1124-
FirebaseMessaging: 585984d0a1df120617eb10b44cad8968b859815e
1122+
FirebaseCoreInternal: df84dd300b561c27d5571684f389bf60b0a5c934
1123+
FirebaseInstallations: 913cf60d0400ebd5d6b63a28b290372ab44590dd
1124+
FirebaseMessaging: 7b5d8033e183ab59eb5b852a53201559e976d366
11251125
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
1126-
glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
1126+
glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2
11271127
GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
11281128
GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
11291129
gRPC-Swift: 74adcaaa62ac5e0a018938840328cb1fdfb09e7b
11301130
hermes-engine: 04437e4291ede4af0c76c25e7efd0eacb8fd25e5
1131-
ImageColors: 4eff2e3e9c3192904109a860de3b46a99ec3ab80
1131+
ImageColors: 869f48b27ca2afb347fd0bada3257a5f698ee55e
11321132
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
11331133
libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
11341134
Logging: beeb016c9c80cf77042d62e83495816847ef108b
11351135
MnemonicSwift: 40ba76b951b75b32e2719df989b4d6da5798fe26
11361136
nanopb: 438bc412db1928dac798aa6fd75726007be04262
11371137
OpenSSL-Universal: d776ce24dab24323e6995dfb17c64d598885d05c
11381138
PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
1139-
RCT-Folly: 8dc08ca5a393b48b1c523ab6220dfdcc0fe000ad
1139+
RCT-Folly: 424b8c9a7a0b9ab2886ffe9c3b041ef628fd4fb1
11401140
RCTRequired: 4ce9da4fa2f8a134f62c70e4ab9d971b9d640f41
11411141
RCTTypeSafety: decfec2884f0c523f799600d2b6105cdc15e13db
11421142
React: ca22a0b3f199b6acac95416ef7eb96cc84a55103
@@ -1153,10 +1153,10 @@ SPEC CHECKSUMS:
11531153
react-native-adservices: 18087a4a5106c5133b0cde73701bf875e3163cfc
11541154
react-native-camera: 806a323ba17579a335ee43a70622f6b8aae98de8
11551155
react-native-compat: c5c101132cacb720def1c72b40cdf0398e34d31e
1156-
react-native-contacts: f4efe82376487f1b87411e22b867e85cc4fb1d3c
1157-
react-native-get-random-values: 419569b6ed3d15bfb9b6781b2f2e058f8e8d2698
1156+
react-native-contacts: 092c5fe3150a5f0cfee0e494c2c144053c2aa137
1157+
react-native-get-random-values: d16467cf726c618e9c7a8c3c39c31faa2244bbba
11581158
react-native-image-picker: f02b573847436881b851f74b7afbf26a0b0107aa
1159-
react-native-in-app-review: b3d1eed3d1596ebf6539804778272c4c65e4a400
1159+
react-native-in-app-review: 668f4c80d7f95945e0ad7833e98c466cb40d6808
11601160
react-native-keyboard-controller: d7eb26730f87cc9b27e8998dd0491a8a4da98c45
11611161
react-native-mail: 6e83813066984b26403d3fdfe79ac7bb31857e3c
11621162
react-native-mymonero-core: ea591a13d86ce9fec558f1f9d7c0d5f23e46d20d
@@ -1185,26 +1185,26 @@ SPEC CHECKSUMS:
11851185
rn-id-blurview: 35bf4f960b8b108d12ed8a8ff14cbc22ed908081
11861186
RNBootSplash: efd6dbf15b2579fb86bc575b8b676d1c5ac5709f
11871187
RNCAsyncStorage: c483708b137c90f4063675058a78b7d6d63fbf55
1188-
RNCClipboard: 4598dae0fe33e2aa130d9d213e2007be78310266
1188+
RNCClipboard: f6679d470d0da2bce2a37b0af7b9e0bf369ecda5
11891189
RNCPicker: 68cada0778c2ec65d200a3ae4b44739a0396d333
11901190
RNDateTimePicker: a3d13ed62d7d781dfe0ebc79d04340a4e6350e2b
11911191
RNDeviceInfo: ae26ae45db3f9937f038a284bcd0a1db8d70db96
1192-
RNFastImage: dc2b8ac381af7da9c0690f4ae80335019635718e
1193-
RNFBApp: 2218806532c0cc83b41cbe5bd1ff42714dff9b3f
1194-
RNFBMessaging: ea63b6bdd0f56647329616776b8b54cf891a3aea
1192+
RNFastImage: 462a183c4b0b6b26fdfd639e1ed6ba37536c3b87
1193+
RNFBApp: 4e6da65e29a144d20bcb5bf264fc8e2055831bab
1194+
RNFBMessaging: fb5a9b0a3043d5d3e6e9fe7b27b78fcc3a0f753f
11951195
RNFS: 89de7d7f4c0f6bafa05343c578f61118c8282ed8
11961196
RNGestureHandler: be422bc1b0a1deb4be02c41f0b8aea1438216d55
1197-
RNLocalize: 080849cb8a824d9f759b8a5ae00c8321d46dbed0
1197+
RNLocalize: 6a87f0490f1793d7a70042e4c55eb9a1ba6dd5b4
11981198
RNPermissions: c53f3a6231338accf1a641ab6261f87ac59cfb2f
1199-
RNQrGenerator: 79441166c804207b55a7737b9031590efe0d59d9
1199+
RNQrGenerator: 95feb09b4b2ed65f3a4afe795a20beed4b134ab5
12001200
RNReactNativeHapticFeedback: 8364333ca888b1b7ec9d2daf04b010ee5436366e
12011201
RNReanimated: b83a48d27a23ff20d88d2a55558a84b82ef10591
12021202
RNScreens: 448026fcd1beb88770b0a67a871a3d1bf9cdde0a
12031203
RNSecureRandom: b64d263529492a6897e236a22a2c4249aa1b53dc
12041204
RNSentry: 30748d76efd178fc033671cb65689992805045d5
12051205
RNShare: ec3bd4a4432757294f6a802edbc359b9fc68cc54
12061206
RNSound: 436aa4de81ae87b90e1781b5dd9247df3aa4622a
1207-
RNStoreReview: 30ae7a0ce3e2dd1d753df104bb20d4bea1f8a96e
1207+
RNStoreReview: 613c43e9132998ed41a65946e20c223c91b36464
12081208
RNSVG: e77adf5edb2302f0f10dd03a09e92bb9420d914e
12091209
RNVectorIcons: 2d86acb67d3b496b55ec50893f751ce5ce74783e
12101210
SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d

‎maestro/03-login/C184036-ip2fa-01.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
appId: ${MAESTRO_APP_ID}
88
tags:
9-
- android
9+
- all
1010
- C184036
1111
---
1212
- runFlow:

‎maestro/03-login/C190284-2fa-01.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@ tags:
5353
text: "SKIP"
5454
optional: true
5555

56+
# If the survey modal shows, dismiss it
57+
- tapOn:
58+
text: "Dismiss"
59+
optional: true
60+
5661
- assertVisible: "Assets"
5762
- tapOn: "Assets"
5863
- assertVisible: "Wallets"

‎maestro/11-markets/C202732-markets.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ tags:
2323
text: "Cancel"
2424
optional: true
2525

26+
# If the survey modal shows, dismiss it
27+
- tapOn:
28+
text: "Dismiss"
29+
optional: true
30+
2631
- extendedWaitUntil:
2732
visible: "Assets"
2833
timeout: 15000

‎maestro/12-side-menu/C202842-side-menu-no-crash.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ tags:
2323
text: "Cancel"
2424
optional: true
2525

26+
# If the survey modal shows, dismiss it
27+
- tapOn:
28+
text: "Dismiss"
29+
optional: true
30+
2631
- extendedWaitUntil:
2732
visible: "Assets"
2833
timeout: 15000

‎maestro/12-side-menu/C202842a-side-menu-no-crash.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ tags:
2424
text: "Cancel"
2525
optional: true
2626

27+
# If the survey modal shows, dismiss it
28+
- tapOn:
29+
text: "Dismiss"
30+
optional: true
31+
2732
- extendedWaitUntil:
2833
visible: "Assets"
2934
timeout: 15000

0 commit comments

Comments
 (0)