Skip to content

Commit 03caaeb

Browse files
j0ntzj0ntz
committed
Merge staging into master
2 parents 6729f1f + 86ea451 commit 03caaeb

48 files changed

Lines changed: 1445 additions & 506 deletions

Some content is hidden

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

‎CHANGELOG.md‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,17 @@
11
# edge-react-gui
22

3-
## 4.45.0 (staging)
3+
## Unreleased (develop)
4+
5+
## 4.46.0 (staging)
6+
7+
- added: Xgram swap exchange plugin support
8+
- added: New Banxa payment methods
9+
- added: Debug settings scene (Developer Mode only) with nodes/servers inspection, engine `dataDump` viewer, and log viewer
10+
- fixed: Swap quote timeout error interrupting user after cancelling a slow swap search
11+
- fixed: Disable "Migrate Wallets" button when no assets are available to migrate
12+
- fixed: Contacts permission prompt no longer appears on first receive and only shows from transaction-list or payee edit flows
13+
14+
## 4.45.0 (2025-03-10)
415

516
- fixed: Fixed Zano token minting transaction detection issues.
617
- fixed: Fixed Zano resync data clearing bug.

‎eslint.config.mjs‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ export default [
8383

8484
'scripts/updateVersion.ts',
8585
'src/actions/BackupModalActions.tsx',
86-
'src/actions/CategoriesActions.ts',
8786

8887
'src/actions/CreateWalletActions.tsx',
8988

@@ -105,7 +104,7 @@ export default [
105104
'src/actions/SoundActions.ts',
106105
'src/actions/TokenTermsActions.tsx',
107106
'src/actions/TransactionExportActions.tsx',
108-
'src/actions/WalletActions.tsx',
107+
109108
'src/actions/WalletListActions.tsx',
110109
'src/actions/WalletListMenuActions.tsx',
111110
'src/app.ts',
@@ -175,8 +174,6 @@ export default [
175174

176175
'src/components/modals/CategoryModal.tsx',
177176

178-
'src/components/modals/ContactListModal.tsx',
179-
'src/components/modals/ContactsPermissionModal.tsx',
180177
'src/components/modals/CountryListModal.tsx',
181178
'src/components/modals/DateModal.tsx',
182179
'src/components/modals/FiatListModal.tsx',
@@ -185,7 +182,7 @@ export default [
185182

186183
'src/components/modals/FundAccountModal.tsx',
187184
'src/components/modals/GradientFadeout.tsx',
188-
'src/components/modals/HelpModal.tsx',
185+
189186
'src/components/modals/InsufficientFeesModal.tsx',
190187
'src/components/modals/ListModal.tsx',
191188
'src/components/modals/LoanWelcomeModal.tsx',
@@ -199,7 +196,6 @@ export default [
199196
'src/components/modals/ScanModal.tsx',
200197
'src/components/modals/StateProvinceListModal.tsx',
201198

202-
'src/components/modals/SwapVerifyTermsModal.tsx',
203199
'src/components/modals/TextInputModal.tsx',
204200
'src/components/modals/TransferModal.tsx',
205201
'src/components/modals/WalletListMenuModal.tsx',
@@ -223,7 +219,7 @@ export default [
223219
'src/components/navigation/TransactionDetailsTitle.tsx',
224220
'src/components/notification/NotificationCenterCard.tsx',
225221
'src/components/progress-indicators/AccountSyncBar.tsx',
226-
'src/components/progress-indicators/CancellableProcessingScene.tsx',
222+
227223
'src/components/progress-indicators/FullScreenLoader.tsx',
228224
'src/components/progress-indicators/LoadingSplashScreen.tsx',
229225

@@ -242,7 +238,6 @@ export default [
242238
'src/components/scenes/ConfirmScene.tsx',
243239
'src/components/scenes/CreateWalletAccountSelectScene.tsx',
244240
'src/components/scenes/CreateWalletAccountSetupScene.tsx',
245-
'src/components/scenes/CreateWalletCompletionScene.tsx',
246241

247242
'src/components/scenes/CreateWalletImportOptionsScene.tsx',
248243
'src/components/scenes/CreateWalletImportScene.tsx',
@@ -282,8 +277,6 @@ export default [
282277
'src/components/scenes/Loans/LoanStatusScene.tsx',
283278

284279
'src/components/scenes/ManageTokensScene.tsx',
285-
'src/components/scenes/MigrateWalletCalculateFeeScene.tsx',
286-
'src/components/scenes/MigrateWalletCompletionScene.tsx',
287280

288281
'src/components/scenes/NotificationCenterScene.tsx',
289282
'src/components/scenes/NotificationScene.tsx',
@@ -299,7 +292,6 @@ export default [
299292
'src/components/scenes/SwapSuccessScene.tsx',
300293
'src/components/scenes/SweepPrivateKeyCalculateFeeScene.tsx',
301294
'src/components/scenes/SweepPrivateKeyCompletionScene.tsx',
302-
'src/components/scenes/SweepPrivateKeyProcessingScene.tsx',
303295

304296
'src/components/scenes/TransactionDetailsScene.tsx',
305297

@@ -411,7 +403,7 @@ export default [
411403
'src/controllers/loan-manager/redux/actions.ts',
412404
'src/controllers/loan-manager/util/waitForLoanAccountSync.ts',
413405
'src/hooks/animations/useFadeAnimation.ts',
414-
'src/hooks/redux/useContactThumbnail.ts',
406+
415407
'src/hooks/useAbortable.ts',
416408
'src/hooks/useAccountSyncRatio.tsx',
417409
'src/hooks/useAsyncEffect.ts',

‎ios/Podfile.lock‎

Lines changed: 12 additions & 12 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.43.3):
18+
- edge-core-js (2.43.4):
1919
- React-Core
20-
- edge-currency-accountbased (4.75.3):
20+
- edge-currency-accountbased (4.77.0):
2121
- React-Core
22-
- edge-currency-plugins (3.8.11):
22+
- edge-currency-plugins (3.9.0):
2323
- React-Core
24-
- edge-exchange-plugins (2.42.3):
24+
- edge-exchange-plugins (2.43.0):
2525
- React-Core
26-
- edge-login-ui-rn (3.35.1):
26+
- edge-login-ui-rn (3.35.3):
2727
- React-Core
2828
- EXConstants (17.1.7):
2929
- ExpoModulesCore
@@ -1663,7 +1663,7 @@ PODS:
16631663
- ReactCommon/turbomodule/bridging
16641664
- ReactCommon/turbomodule/core
16651665
- Yoga
1666-
- react-native-piratechain (0.5.21):
1666+
- react-native-piratechain (0.5.22):
16671667
- gRPC-Swift (~> 1.8)
16681668
- MnemonicSwift (~> 2.2)
16691669
- React-Core
@@ -3335,11 +3335,11 @@ SPEC CHECKSUMS:
33353335
CNIOWindows: 3047f2d8165848a3936a0a755fee27c6b5ee479b
33363336
disklet: 8a20bf8a568635b6e6bb8f93297dac13ee5cef98
33373337
DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
3338-
edge-core-js: 25c812c0a6cd8c6862da9acbedcb744eb1474ce1
3339-
edge-currency-accountbased: 27d31e4f3fe4bf63dfefd2ea56a2c2a8734d205b
3340-
edge-currency-plugins: 002abe3c0d4fb6040046ec779b208c6aa83bee83
3341-
edge-exchange-plugins: fa709f9b47b1c7985f5c594f17596de6c3c97cae
3342-
edge-login-ui-rn: 923d44766b7611aad471cf8107aaf3950dc6d6a4
3338+
edge-core-js: 4a682c282f0e539e8ce24d5050fc9d8c19379c3d
3339+
edge-currency-accountbased: da708080381fe41112e120ec1ecd125bc757f773
3340+
edge-currency-plugins: fe38711931eb630b3d33c1624224446690c00d8b
3341+
edge-exchange-plugins: d0aa0bac5ede747ee276facbd616a29ba1d762e4
3342+
edge-login-ui-rn: 7e777d276fa6e6f73f5f1fb9c60abd272f85728d
33433343
EXConstants: 98bcf0f22b820f9b28f9fee55ff2daededadd2f8
33443344
Expo: 43d9e0c3108cc3a1c2739743e9b51086144ee4b0
33453345
ExpoAsset: ef06e880126c375f580d4923fdd1cdf4ee6ee7d6
@@ -3410,7 +3410,7 @@ SPEC CHECKSUMS:
34103410
react-native-mymonero-core: 89717c706af7024c9100ccb6c3f22a587ccc8f09
34113411
react-native-netinfo: cec9c4e86083cb5b6aba0e0711f563e2fbbff187
34123412
react-native-performance: f0471c84eda0f6625bd42a1f515b1b216f284b12
3413-
react-native-piratechain: efcbba8a1d4cd340675552a8d83f5c3e10762570
3413+
react-native-piratechain: 7a589e5935cce38db012200c2d1e454502af7f10
34143414
react-native-render-html: 5afc4751f1a98621b3009432ef84c47019dcb2bd
34153415
react-native-safari-view: 07dc856a2663fef31eaca6beb79b111b8f6cf1f2
34163416
react-native-safe-area-context: 83e0ac3d023997de1c2e035af907cc4dc05f718c

‎package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "edge-react-gui",
3-
"version": "4.45.0",
3+
"version": "4.46.0",
44
"private": true,
55
"description": "Edge Wallet React GUI",
66
"homepage": "https://edge.app",
@@ -106,13 +106,13 @@
106106
"deprecated-react-native-prop-types": "^5.0.0",
107107
"detect-bundler": "^1.1.0",
108108
"disklet": "^0.5.2",
109-
"edge-core-js": "^2.43.3",
110-
"edge-currency-accountbased": "^4.75.3",
109+
"edge-core-js": "^2.43.4",
110+
"edge-currency-accountbased": "^4.77.0",
111111
"edge-currency-monero": "^2.2.0",
112-
"edge-currency-plugins": "^3.8.11",
113-
"edge-exchange-plugins": "^2.42.3",
112+
"edge-currency-plugins": "^3.9.0",
113+
"edge-exchange-plugins": "^2.43.0",
114114
"edge-info-server": "^3.10.0",
115-
"edge-login-ui-rn": "^3.35.1",
115+
"edge-login-ui-rn": "^3.35.3",
116116
"ethers": "^5.7.2",
117117
"expo": "^53.0.0",
118118
"jsrsasign": "^11.1.0",
@@ -154,7 +154,7 @@
154154
"react-native-patina": "^0.1.6",
155155
"react-native-performance": "^5.1.4",
156156
"react-native-permissions": "^4.1.5",
157-
"react-native-piratechain": "^0.5.21",
157+
"react-native-piratechain": "^0.5.22",
158158
"react-native-reanimated": "^4.1.3",
159159
"react-native-render-html": "^6.3.4",
160160
"react-native-reorderable-list": "^0.5.0",

‎src/__tests__/modals/__snapshots__/HelpModal.test.tsx.snap‎

Lines changed: 10 additions & 157 deletions
Original file line numberDiff line numberDiff line change
@@ -572,15 +572,22 @@ exports[`HelpModal should render with loading props 1`] = `
572572
}
573573
>
574574
<Text
575+
adjustsFontSizeToFit={true}
575576
allowFontScaling={false}
576577
selectable={false}
577578
style={
578579
[
579580
{
580-
"color": "#00f1a2",
581-
"fontSize": 34,
581+
"color": undefined,
582+
"fontSize": 12,
582583
},
583-
undefined,
584+
[
585+
{
586+
"color": "#00f1a2",
587+
"fontSize": 34,
588+
},
589+
undefined,
590+
],
584591
{
585592
"fontFamily": "Ionicons",
586593
"fontStyle": "normal",
@@ -650,160 +657,6 @@ exports[`HelpModal should render with loading props 1`] = `
650657
</View>
651658
</View>
652659
</View>
653-
<View
654-
accessibilityState={
655-
{
656-
"busy": undefined,
657-
"checked": undefined,
658-
"disabled": false,
659-
"expanded": undefined,
660-
"selected": undefined,
661-
}
662-
}
663-
accessibilityValue={
664-
{
665-
"max": undefined,
666-
"min": undefined,
667-
"now": undefined,
668-
"text": undefined,
669-
}
670-
}
671-
accessible={false}
672-
collapsable={false}
673-
focusable={true}
674-
onClick={[Function]}
675-
onResponderGrant={[Function]}
676-
onResponderMove={[Function]}
677-
onResponderRelease={[Function]}
678-
onResponderTerminate={[Function]}
679-
onResponderTerminationRequest={[Function]}
680-
onStartShouldSetResponder={[Function]}
681-
style={
682-
{
683-
"alignSelf": "stretch",
684-
"borderRadius": 16,
685-
"marginBottom": 11,
686-
"marginLeft": 11,
687-
"marginRight": 11,
688-
"marginTop": 11,
689-
"opacity": 1,
690-
"paddingBottom": 11,
691-
"paddingLeft": 11,
692-
"paddingRight": 11,
693-
"paddingTop": 11,
694-
}
695-
}
696-
>
697-
<View
698-
style={
699-
{
700-
"backgroundColor": "rgba(255, 255, 255, .1)",
701-
"borderRadius": 16,
702-
"bottom": 0,
703-
"left": 0,
704-
"overflow": "hidden",
705-
"position": "absolute",
706-
"right": 0,
707-
"top": 0,
708-
}
709-
}
710-
/>
711-
<View
712-
style={
713-
{
714-
"alignItems": "center",
715-
"flexDirection": "row",
716-
"justifyContent": "space-between",
717-
"width": "100%",
718-
}
719-
}
720-
>
721-
<View
722-
style={
723-
{
724-
"margin": 11,
725-
}
726-
}
727-
>
728-
<Text
729-
allowFontScaling={false}
730-
selectable={false}
731-
style={
732-
[
733-
{
734-
"color": "#00f1a2",
735-
"fontSize": 34,
736-
},
737-
undefined,
738-
{
739-
"fontFamily": "custom",
740-
"fontStyle": "normal",
741-
"fontWeight": "normal",
742-
},
743-
{},
744-
]
745-
}
746-
>
747-
748-
</Text>
749-
</View>
750-
<View
751-
style={
752-
{
753-
"alignItems": "flex-start",
754-
"flex": 1,
755-
"flexDirection": "column",
756-
"margin": 11,
757-
}
758-
}
759-
>
760-
<Text
761-
adjustsFontSizeToFit={true}
762-
allowFontScaling={false}
763-
minimumFontScale={0.65}
764-
numberOfLines={1}
765-
style={
766-
[
767-
{
768-
"color": "#FFFFFF",
769-
"fontFamily": "Quicksand-Regular",
770-
"fontSize": 22,
771-
"includeFontPadding": false,
772-
},
773-
undefined,
774-
null,
775-
]
776-
}
777-
>
778-
Submit a Support Ticket
779-
</Text>
780-
<Text
781-
adjustsFontSizeToFit={true}
782-
allowFontScaling={false}
783-
minimumFontScale={0.65}
784-
numberOfLines={2}
785-
style={
786-
[
787-
{
788-
"color": "#FFFFFF",
789-
"fontFamily": "Quicksand-Regular",
790-
"fontSize": 22,
791-
"includeFontPadding": false,
792-
},
793-
{
794-
"color": "#3dd9f4",
795-
"fontSize": 17,
796-
"marginTop": 6,
797-
},
798-
null,
799-
]
800-
}
801-
>
802-
Troubleshooting and technical support
803-
</Text>
804-
</View>
805-
</View>
806-
</View>
807660
<View
808661
accessibilityState={
809662
{

0 commit comments

Comments
 (0)