Skip to content

Commit 165de9a

Browse files
Jon-edgeJon-edge
authored
Merge pull request #5883 from EdgeApp/jon/gift-cards
Jon/gift cards
2 parents fbc288f + 4c8d85e commit 165de9a

File tree

66 files changed

+6448
-382
lines changed

Some content is hidden

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

66 files changed

+6448
-382
lines changed

‎eslint.config.mjs‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export default [
8282
'scripts/updateVersion.ts',
8383
'src/actions/BackupModalActions.tsx',
8484
'src/actions/CategoriesActions.ts',
85-
'src/actions/CountryListActions.tsx',
85+
8686
'src/actions/CreateWalletActions.tsx',
8787

8888
'src/actions/DeviceSettingsActions.ts',
@@ -125,7 +125,7 @@ export default [
125125
'src/components/cards/IconMessageCard.tsx',
126126
'src/components/cards/LoanDetailsSummaryCard.tsx',
127127
'src/components/cards/LoanSummaryCard.tsx',
128-
'src/components/cards/MarketsCard.tsx',
128+
129129
'src/components/cards/StakingOptionCard.tsx',
130130
'src/components/cards/StakingReturnsCard.tsx',
131131
'src/components/cards/SupportCard.tsx',
@@ -164,7 +164,7 @@ export default [
164164
'src/components/keyboard/KavButton.tsx',
165165

166166
'src/components/layout/Peek.tsx',
167-
'src/components/layout/SceneContainer.tsx',
167+
168168
'src/components/modals/AccelerateTxModal.tsx',
169169
'src/components/modals/AddressModal.tsx',
170170
'src/components/modals/AirshipFullScreenSpinner.tsx',
@@ -204,7 +204,7 @@ export default [
204204

205205
'src/components/modals/WalletListSortModal.tsx',
206206
'src/components/modals/WcSmartContractModal.tsx',
207-
'src/components/modals/WebViewModal.tsx',
207+
208208
'src/components/navigation/AlertDropdown.tsx',
209209
'src/components/navigation/BackButton.tsx',
210210
'src/components/navigation/CurrencySettingsTitle.tsx',
@@ -226,7 +226,7 @@ export default [
226226
'src/components/progress-indicators/LoadingSplashScreen.tsx',
227227

228228
'src/components/progress-indicators/StepProgressBar.tsx',
229-
'src/components/rows/CoinRankRow.tsx',
229+
230230
'src/components/rows/CryptoFiatAmountRow.tsx',
231231
'src/components/rows/CurrencyRow.tsx',
232232

@@ -241,7 +241,7 @@ export default [
241241
'src/components/scenes/ChangePinScene.tsx',
242242
'src/components/scenes/ChangeUsernameScene.tsx',
243243
'src/components/scenes/CoinRankingDetailsScene.tsx',
244-
'src/components/scenes/CoinRankingScene.tsx',
244+
245245
'src/components/scenes/ConfirmScene.tsx',
246246
'src/components/scenes/CreateWalletAccountSelectScene.tsx',
247247
'src/components/scenes/CreateWalletAccountSetupScene.tsx',
@@ -255,7 +255,6 @@ export default [
255255
'src/components/scenes/DefaultFiatSettingScene.tsx',
256256
'src/components/scenes/DuressModeHowToScene.tsx',
257257
'src/components/scenes/DuressModeSettingScene.tsx',
258-
'src/components/scenes/DuressPinScene.tsx',
259258

260259
'src/components/scenes/EditTokenScene.tsx',
261260
'src/components/scenes/ExtraTabScene.tsx',
@@ -301,9 +300,7 @@ export default [
301300

302301
'src/components/scenes/SpendingLimitsScene.tsx',
303302
'src/components/scenes/Staking/EarnScene.tsx',
304-
'src/components/scenes/Staking/StakeOptionsScene.tsx',
305303

306-
'src/components/scenes/SwapCreateScene.tsx',
307304
'src/components/scenes/SwapProcessingScene.tsx',
308305
'src/components/scenes/SwapSettingsScene.tsx',
309306
'src/components/scenes/SwapSuccessScene.tsx',
@@ -372,7 +369,6 @@ export default [
372369
'src/components/themed/ModalParts.tsx',
373370
'src/components/themed/PinDots.tsx',
374371

375-
'src/components/themed/SceneFooterWrapper.tsx',
376372
'src/components/themed/SceneHeader.tsx',
377373

378374
'src/components/themed/SearchFooter.tsx',
@@ -516,7 +512,7 @@ export default [
516512
'src/util/GuiPluginTools.ts',
517513
'src/util/haptic.ts',
518514
'src/util/infoUtils.ts',
519-
'src/util/logger.ts',
515+
520516
'src/util/maestro.ts',
521517
'src/util/memoUtils.ts',
522518
'src/util/middleware/perfLogger.ts',

‎ios/Podfile.lock‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1670,6 +1670,8 @@ PODS:
16701670
- MnemonicSwift (~> 2.2)
16711671
- React-Core
16721672
- SQLite.swift/standalone (~> 0.14)
1673+
- react-native-render-html (6.3.4):
1674+
- React-Core
16731675
- react-native-safari-view (1.0.0):
16741676
- React
16751677
- react-native-safe-area-context (5.6.1):
@@ -2940,6 +2942,7 @@ DEPENDENCIES:
29402942
- "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
29412943
- react-native-performance (from `../node_modules/react-native-performance`)
29422944
- react-native-piratechain (from `../node_modules/react-native-piratechain`)
2945+
- react-native-render-html (from `../node_modules/react-native-render-html`)
29432946
- react-native-safari-view (from `../node_modules/react-native-safari-view`)
29442947
- react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
29452948
- react-native-webview (from `../node_modules/react-native-webview`)
@@ -3188,6 +3191,8 @@ EXTERNAL SOURCES:
31883191
:path: "../node_modules/react-native-performance"
31893192
react-native-piratechain:
31903193
:path: "../node_modules/react-native-piratechain"
3194+
react-native-render-html:
3195+
:path: "../node_modules/react-native-render-html"
31913196
react-native-safari-view:
31923197
:path: "../node_modules/react-native-safari-view"
31933198
react-native-safe-area-context:
@@ -3410,6 +3415,7 @@ SPEC CHECKSUMS:
34103415
react-native-netinfo: cec9c4e86083cb5b6aba0e0711f563e2fbbff187
34113416
react-native-performance: f0471c84eda0f6625bd42a1f515b1b216f284b12
34123417
react-native-piratechain: b1a2e627232b583e0060b50db340becb64e3cde1
3418+
react-native-render-html: 5afc4751f1a98621b3009432ef84c47019dcb2bd
34133419
react-native-safari-view: 07dc856a2663fef31eaca6beb79b111b8f6cf1f2
34143420
react-native-safe-area-context: 83e0ac3d023997de1c2e035af907cc4dc05f718c
34153421
react-native-webview: 69c118d283fccfbc4fca0cd680e036ff3bf188fa

‎package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@
156156
"react-native-permissions": "^4.1.5",
157157
"react-native-piratechain": "^0.5.19",
158158
"react-native-reanimated": "^4.1.3",
159+
"react-native-render-html": "^6.3.4",
159160
"react-native-reorderable-list": "^0.5.0",
160161
"react-native-safari-view": "^2.1.0",
161162
"react-native-safe-area-context": "^5.6.1",

‎src/__tests__/scenes/__snapshots__/CreateWalletSelectCryptoScene.test.tsx.snap‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2293,6 +2293,7 @@ exports[`CreateWalletSelectCrypto should render with loading props 1`] = `
22932293
]
22942294
}
22952295
nativeID="10"
2296+
onLayout={[Function]}
22962297
style={
22972298
[
22982299
{

‎src/__tests__/scenes/__snapshots__/FioConnectWalletConfirmScene.test.tsx.snap‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -357,15 +357,10 @@ exports[`FioConnectWalletConfirm should render with loading props 1`] = `
357357
<View
358358
style={
359359
{
360-
"flex": undefined,
361-
"marginBottom": undefined,
362-
"marginLeft": undefined,
363-
"marginRight": undefined,
364-
"marginTop": undefined,
360+
"flex": 1,
361+
"marginTop": 0,
365362
"paddingBottom": 11,
366-
"paddingLeft": 11,
367-
"paddingRight": 11,
368-
"paddingTop": 11,
363+
"paddingHorizontal": 11,
369364
}
370365
}
371366
>

‎src/__tests__/scenes/__snapshots__/SwapConfirmationScene.test.tsx.snap‎

Lines changed: 67 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -273,97 +273,92 @@ exports[`SwapConfirmationScene should render with loading props 1`] = `
273273
<View
274274
style={
275275
{
276-
"flex": undefined,
277-
"marginBottom": undefined,
278-
"marginLeft": undefined,
279-
"marginRight": undefined,
280-
"marginTop": undefined,
281-
"paddingBottom": 11,
276+
"justifyContent": "center",
277+
"overflow": "visible",
282278
"paddingLeft": 11,
283-
"paddingRight": 11,
284-
"paddingTop": 11,
285279
}
286280
}
287281
>
288282
<View
289283
style={
290284
{
291-
"justifyContent": "center",
292-
"overflow": "visible",
293-
"paddingBottom": 11,
285+
"alignItems": "center",
286+
"flexDirection": "row",
287+
"justifyContent": "space-between",
288+
"marginBottom": 11,
289+
"marginHorizontal": 11,
294290
}
295291
}
296292
>
297-
<View
298-
style={
299-
{
300-
"alignItems": "center",
301-
"flexDirection": "row",
302-
"justifyContent": "space-between",
303-
"marginBottom": 11,
304-
"marginHorizontal": 11,
305-
}
306-
}
307-
>
308-
<Text
309-
adjustsFontSizeToFit={true}
310-
allowFontScaling={false}
311-
minimumFontScale={0.65}
312-
numberOfLines={1}
313-
style={
314-
[
315-
{
316-
"color": "#FFFFFF",
317-
"fontFamily": "Quicksand-Regular",
318-
"fontSize": 22,
319-
"includeFontPadding": false,
320-
},
321-
{
322-
"fontFamily": "Quicksand-Medium",
323-
"fontSize": 27,
324-
},
325-
null,
326-
]
327-
}
328-
>
329-
Exchange
330-
</Text>
331-
</View>
332-
<BVLinearGradient
333-
colors={
334-
[
335-
452984831,
336-
452984831,
337-
]
338-
}
339-
endPoint={
340-
{
341-
"x": 1,
342-
"y": 0.5,
343-
}
344-
}
345-
locations={null}
346-
startPoint={
347-
{
348-
"x": 0,
349-
"y": 0.5,
350-
}
351-
}
293+
<Text
294+
adjustsFontSizeToFit={true}
295+
allowFontScaling={false}
296+
minimumFontScale={0.65}
297+
numberOfLines={1}
352298
style={
353299
[
354300
{
355-
"borderBottomColor": "rgba(255, 255, 255, .1)",
356-
"borderBottomWidth": 1,
357-
"height": 1,
301+
"color": "#FFFFFF",
302+
"fontFamily": "Quicksand-Regular",
303+
"fontSize": 22,
304+
"includeFontPadding": false,
358305
},
359306
{
360-
"margin": 11,
361-
"marginRight": -22,
307+
"fontFamily": "Quicksand-Medium",
308+
"fontSize": 27,
362309
},
310+
null,
363311
]
364312
}
365-
/>
313+
>
314+
Exchange
315+
</Text>
366316
</View>
317+
<BVLinearGradient
318+
colors={
319+
[
320+
452984831,
321+
452984831,
322+
]
323+
}
324+
endPoint={
325+
{
326+
"x": 1,
327+
"y": 0.5,
328+
}
329+
}
330+
locations={null}
331+
startPoint={
332+
{
333+
"x": 0,
334+
"y": 0.5,
335+
}
336+
}
337+
style={
338+
[
339+
{
340+
"borderBottomColor": "rgba(255, 255, 255, .1)",
341+
"borderBottomWidth": 1,
342+
"height": 1,
343+
},
344+
{
345+
"margin": 11,
346+
"marginRight": -22,
347+
},
348+
]
349+
}
350+
/>
351+
</View>
352+
<View
353+
style={
354+
{
355+
"flex": 1,
356+
"marginTop": 0,
357+
"paddingBottom": 11,
358+
"paddingHorizontal": 11,
359+
}
360+
}
361+
>
367362
<View
368363
collapsable={false}
369364
entering={

‎src/__tests__/scenes/__snapshots__/SwapCreateScene.test.tsx.snap‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -272,18 +272,12 @@ exports[`SwapCreateScene should render with loading props 1`] = `
272272
>
273273
<View>
274274
<View
275-
expand={true}
276275
style={
277276
{
278277
"flex": 1,
279-
"marginBottom": undefined,
280-
"marginLeft": undefined,
281-
"marginRight": undefined,
282-
"marginTop": undefined,
278+
"marginTop": 0,
283279
"paddingBottom": 11,
284-
"paddingLeft": 11,
285-
"paddingRight": 11,
286-
"paddingTop": 11,
280+
"paddingHorizontal": 11,
287281
}
288282
}
289283
>

0 commit comments

Comments
 (0)