Skip to content

Commit 057c8d9

Browse files
authored
Merge pull request #5949 from EdgeApp/matthew/monero-lwsf
Replace edge-currency-monero with react-native-monero
2 parents 9443c24 + 8b305fc commit 057c8d9

25 files changed

Lines changed: 810 additions & 2598 deletions

eslint.config.mjs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export default [
105105
'src/actions/TransactionExportActions.tsx',
106106

107107
'src/actions/WalletListActions.tsx',
108-
'src/actions/WalletListMenuActions.tsx',
108+
109109
'src/app.ts',
110110
'src/components/buttons/ButtonsView.tsx',
111111
'src/components/buttons/EdgeSwitch.tsx',
@@ -196,7 +196,6 @@ export default [
196196

197197
'src/components/modals/TextInputModal.tsx',
198198
'src/components/modals/TransferModal.tsx',
199-
'src/components/modals/WalletListMenuModal.tsx',
200199

201200
'src/components/modals/WalletListSortModal.tsx',
202201
'src/components/modals/WcSmartContractModal.tsx',
@@ -325,7 +324,6 @@ export default [
325324
'src/components/text/TitleText.tsx',
326325
'src/components/themed/Alert.tsx',
327326

328-
'src/components/themed/CreateWalletSelectCryptoRow.tsx',
329327
'src/components/themed/DividerLine.tsx',
330328
'src/components/themed/EdgeProviderComponent.tsx',
331329

ios/Podfile.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ PODS:
1717
- DoubleConversion (1.1.6)
1818
- edge-core-js (2.46.0):
1919
- React-Core
20-
- edge-currency-accountbased (4.83.0):
20+
- edge-currency-accountbased (4.84.0):
2121
- React-Core
2222
- edge-currency-plugins (3.10.0):
2323
- React-Core
@@ -1637,7 +1637,7 @@ PODS:
16371637
- Yoga
16381638
- react-native-mail (6.1.1):
16391639
- React-Core
1640-
- react-native-mymonero-core (0.3.4):
1640+
- react-native-monero (0.1.0):
16411641
- React-Core
16421642
- react-native-netinfo (11.4.1):
16431643
- React-Core
@@ -2939,7 +2939,7 @@ DEPENDENCIES:
29392939
- react-native-in-app-review (from `../node_modules/react-native-in-app-review`)
29402940
- react-native-keyboard-controller (from `../node_modules/react-native-keyboard-controller`)
29412941
- react-native-mail (from `../node_modules/react-native-mail`)
2942-
- react-native-mymonero-core (from `../node_modules/react-native-mymonero-core`)
2942+
- react-native-monero (from `../node_modules/react-native-monero`)
29432943
- "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
29442944
- react-native-performance (from `../node_modules/react-native-performance`)
29452945
- react-native-piratechain (from `../node_modules/react-native-piratechain`)
@@ -3185,8 +3185,8 @@ EXTERNAL SOURCES:
31853185
:path: "../node_modules/react-native-keyboard-controller"
31863186
react-native-mail:
31873187
:path: "../node_modules/react-native-mail"
3188-
react-native-mymonero-core:
3189-
:path: "../node_modules/react-native-mymonero-core"
3188+
react-native-monero:
3189+
:path: "../node_modules/react-native-monero"
31903190
react-native-netinfo:
31913191
:path: "../node_modules/@react-native-community/netinfo"
31923192
react-native-performance:
@@ -3341,7 +3341,7 @@ SPEC CHECKSUMS:
33413341
disklet: ef8ef081e35a73fbed579888d29e49edc2f327cc
33423342
DoubleConversion: cb417026b2400c8f53ae97020b2be961b59470cb
33433343
edge-core-js: f6089b99b3fd6fbe5c4d142c024fa84023302330
3344-
edge-currency-accountbased: b4fc0fbc6565374858db6fc37f1bb871a39268aa
3344+
edge-currency-accountbased: 6e15e71b332a0d9db3d265bcedee4b0741d2a6c3
33453345
edge-currency-plugins: a52a61270c53d48edf8a9fc08fe69f52afa5ca0e
33463346
edge-exchange-plugins: c310524a4d20fb514e23ecb403713ef4bd3907f6
33473347
edge-login-ui-rn: 5b9c03326583d1dd4839ca34d065b2b75af5870f
@@ -3413,7 +3413,7 @@ SPEC CHECKSUMS:
34133413
react-native-in-app-review: 668f4c80d7f95945e0ad7833e98c466cb40d6808
34143414
react-native-keyboard-controller: c8968215c7ecdfc43663cfaf9ca991aad4179815
34153415
react-native-mail: 6e83813066984b26403d3fdfe79ac7bb31857e3c
3416-
react-native-mymonero-core: 89717c706af7024c9100ccb6c3f22a587ccc8f09
3416+
react-native-monero: 74d4e6ded309922493a58ab50d1ab64848d10262
34173417
react-native-netinfo: cec9c4e86083cb5b6aba0e0711f563e2fbbff187
34183418
react-native-performance: f0471c84eda0f6625bd42a1f515b1b216f284b12
34193419
react-native-piratechain: ee2659672d55c924fba54a2bec0e86b027c5eb9b

ios/edge.xcodeproj/project.pbxproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
3D5BD9862A4CEFB900590088 /* EdgeCore.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D5BD9842A4CEFB900590088 /* EdgeCore.swift */; };
1515
3D5BD9882A4CEFC700590088 /* Base58.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3D5BD9872A4CEFC700590088 /* Base58.swift */; };
1616
3D5BD98A2A4CF04C00590088 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3D5BD9892A4CF04C00590088 /* GoogleService-Info.plist */; };
17-
3D5BD9952A4D250700590088 /* edge-core in Resources */ = {isa = PBXBuildFile; fileRef = 3D5BD9922A4D250700590088 /* edge-core */; };
1817
3D5BD9962A4D250700590088 /* blank.html in Resources */ = {isa = PBXBuildFile; fileRef = 3D5BD9932A4D250700590088 /* blank.html */; };
1918
3D5BD9BD2A4D27C400590088 /* SourceSansPro-ExtraLightItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3D5BD9AC2A4D277B00590088 /* SourceSansPro-ExtraLightItalic.ttf */; };
2019
3D5BD9BE2A4D27C400590088 /* SourceSansPro-SemiboldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3D5BD9B82A4D277B00590088 /* SourceSansPro-SemiboldItalic.ttf */; };
@@ -57,7 +56,6 @@
5756
3D5BD9872A4CEFC700590088 /* Base58.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Base58.swift; sourceTree = "<group>"; };
5857
3D5BD9892A4CF04C00590088 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "edge/GoogleService-Info.plist"; sourceTree = "<group>"; };
5958
3D5BD98B2A4D245500590088 /* edge.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = edge.entitlements; path = edge/edge.entitlements; sourceTree = "<group>"; };
60-
3D5BD9922A4D250700590088 /* edge-core */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "edge-core"; path = "../android/app/src/main/assets/edge-core"; sourceTree = "<group>"; };
6159
3D5BD9932A4D250700590088 /* blank.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = blank.html; path = ../android/app/src/main/assets/blank.html; sourceTree = "<group>"; };
6260
3D5BD9AA2A4D277B00590088 /* SourceSansPro-LightItalic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "SourceSansPro-LightItalic.ttf"; path = "../android/app/src/main/assets/fonts/SourceSansPro-LightItalic.ttf"; sourceTree = "<group>"; };
6361
3D5BD9AB2A4D277B00590088 /* SourceSansPro-Semibold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "SourceSansPro-Semibold.ttf"; path = "../android/app/src/main/assets/fonts/SourceSansPro-Semibold.ttf"; sourceTree = "<group>"; };
@@ -133,7 +131,6 @@
133131
3D18A8F92A5333DC00F3B19B /* audio_sent.mp3 */,
134132
3D5BD9932A4D250700590088 /* blank.html */,
135133
3D5BD9AD2A4D277B00590088 /* custom.ttf */,
136-
3D5BD9922A4D250700590088 /* edge-core */,
137134
3D5BD9BA2A4D277B00590088 /* Quicksand-Bold.ttf */,
138135
3D5BD9AE2A4D277B00590088 /* Quicksand-Light.ttf */,
139136
3D5BD9BC2A4D277B00590088 /* Quicksand-Medium.ttf */,
@@ -290,7 +287,6 @@
290287
3D5BD9CC2A4D27C400590088 /* Quicksand-Medium.ttf in Resources */,
291288
3D5BD9CE2A4D27C400590088 /* SourceSansPro-Bold.ttf in Resources */,
292289
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
293-
3D5BD9952A4D250700590088 /* edge-core in Resources */,
294290
3D5BD9CA2A4D27C400590088 /* Quicksand-Bold.ttf in Resources */,
295291
3D5BD9BE2A4D27C400590088 /* SourceSansPro-SemiboldItalic.ttf in Resources */,
296292
3D5BD9C02A4D27C400590088 /* Quicksand-Regular.ttf in Resources */,

0 commit comments

Comments
 (0)