Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export default [
'scripts/updateVersion.ts',
'src/actions/BackupModalActions.tsx',
'src/actions/CategoriesActions.ts',
'src/actions/CountryListActions.tsx',

'src/actions/CreateWalletActions.tsx',

'src/actions/DeviceSettingsActions.ts',
Expand Down Expand Up @@ -125,7 +125,7 @@ export default [
'src/components/cards/IconMessageCard.tsx',
'src/components/cards/LoanDetailsSummaryCard.tsx',
'src/components/cards/LoanSummaryCard.tsx',
'src/components/cards/MarketsCard.tsx',

'src/components/cards/StakingOptionCard.tsx',
'src/components/cards/StakingReturnsCard.tsx',
'src/components/cards/SupportCard.tsx',
Expand Down Expand Up @@ -164,7 +164,7 @@ export default [
'src/components/keyboard/KavButton.tsx',

'src/components/layout/Peek.tsx',
'src/components/layout/SceneContainer.tsx',

'src/components/modals/AccelerateTxModal.tsx',
'src/components/modals/AddressModal.tsx',
'src/components/modals/AirshipFullScreenSpinner.tsx',
Expand Down Expand Up @@ -204,7 +204,7 @@ export default [

'src/components/modals/WalletListSortModal.tsx',
'src/components/modals/WcSmartContractModal.tsx',
'src/components/modals/WebViewModal.tsx',

'src/components/navigation/AlertDropdown.tsx',
'src/components/navigation/BackButton.tsx',
'src/components/navigation/CurrencySettingsTitle.tsx',
Expand All @@ -226,7 +226,7 @@ export default [
'src/components/progress-indicators/LoadingSplashScreen.tsx',

'src/components/progress-indicators/StepProgressBar.tsx',
'src/components/rows/CoinRankRow.tsx',

'src/components/rows/CryptoFiatAmountRow.tsx',
'src/components/rows/CurrencyRow.tsx',

Expand All @@ -241,7 +241,7 @@ export default [
'src/components/scenes/ChangePinScene.tsx',
'src/components/scenes/ChangeUsernameScene.tsx',
'src/components/scenes/CoinRankingDetailsScene.tsx',
'src/components/scenes/CoinRankingScene.tsx',

'src/components/scenes/ConfirmScene.tsx',
'src/components/scenes/CreateWalletAccountSelectScene.tsx',
'src/components/scenes/CreateWalletAccountSetupScene.tsx',
Expand All @@ -255,7 +255,6 @@ export default [
'src/components/scenes/DefaultFiatSettingScene.tsx',
'src/components/scenes/DuressModeHowToScene.tsx',
'src/components/scenes/DuressModeSettingScene.tsx',
'src/components/scenes/DuressPinScene.tsx',

'src/components/scenes/EditTokenScene.tsx',
'src/components/scenes/ExtraTabScene.tsx',
Expand Down Expand Up @@ -301,9 +300,7 @@ export default [

'src/components/scenes/SpendingLimitsScene.tsx',
'src/components/scenes/Staking/EarnScene.tsx',
'src/components/scenes/Staking/StakeOptionsScene.tsx',

'src/components/scenes/SwapCreateScene.tsx',
'src/components/scenes/SwapProcessingScene.tsx',
'src/components/scenes/SwapSettingsScene.tsx',
'src/components/scenes/SwapSuccessScene.tsx',
Expand Down Expand Up @@ -372,7 +369,6 @@ export default [
'src/components/themed/ModalParts.tsx',
'src/components/themed/PinDots.tsx',

'src/components/themed/SceneFooterWrapper.tsx',
'src/components/themed/SceneHeader.tsx',

'src/components/themed/SearchFooter.tsx',
Expand Down Expand Up @@ -516,7 +512,7 @@ export default [
'src/util/GuiPluginTools.ts',
'src/util/haptic.ts',
'src/util/infoUtils.ts',
'src/util/logger.ts',

'src/util/maestro.ts',
'src/util/memoUtils.ts',
'src/util/middleware/perfLogger.ts',
Expand Down
6 changes: 6 additions & 0 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1670,6 +1670,8 @@ PODS:
- MnemonicSwift (~> 2.2)
- React-Core
- SQLite.swift/standalone (~> 0.14)
- react-native-render-html (6.3.4):
- React-Core
- react-native-safari-view (1.0.0):
- React
- react-native-safe-area-context (5.6.1):
Expand Down Expand Up @@ -2940,6 +2942,7 @@ DEPENDENCIES:
- "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
- react-native-performance (from `../node_modules/react-native-performance`)
- react-native-piratechain (from `../node_modules/react-native-piratechain`)
- react-native-render-html (from `../node_modules/react-native-render-html`)
- react-native-safari-view (from `../node_modules/react-native-safari-view`)
- react-native-safe-area-context (from `../node_modules/react-native-safe-area-context`)
- react-native-webview (from `../node_modules/react-native-webview`)
Expand Down Expand Up @@ -3188,6 +3191,8 @@ EXTERNAL SOURCES:
:path: "../node_modules/react-native-performance"
react-native-piratechain:
:path: "../node_modules/react-native-piratechain"
react-native-render-html:
:path: "../node_modules/react-native-render-html"
react-native-safari-view:
:path: "../node_modules/react-native-safari-view"
react-native-safe-area-context:
Expand Down Expand Up @@ -3410,6 +3415,7 @@ SPEC CHECKSUMS:
react-native-netinfo: cec9c4e86083cb5b6aba0e0711f563e2fbbff187
react-native-performance: f0471c84eda0f6625bd42a1f515b1b216f284b12
react-native-piratechain: b1a2e627232b583e0060b50db340becb64e3cde1
react-native-render-html: 5afc4751f1a98621b3009432ef84c47019dcb2bd
react-native-safari-view: 07dc856a2663fef31eaca6beb79b111b8f6cf1f2
react-native-safe-area-context: 83e0ac3d023997de1c2e035af907cc4dc05f718c
react-native-webview: 69c118d283fccfbc4fca0cd680e036ff3bf188fa
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@
"react-native-permissions": "^4.1.5",
"react-native-piratechain": "^0.5.19",
"react-native-reanimated": "^4.1.3",
"react-native-render-html": "^6.3.4",
"react-native-reorderable-list": "^0.5.0",
"react-native-safari-view": "^2.1.0",
"react-native-safe-area-context": "^5.6.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2293,6 +2293,7 @@ exports[`CreateWalletSelectCrypto should render with loading props 1`] = `
]
}
nativeID="10"
onLayout={[Function]}
style={
[
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -357,15 +357,10 @@ exports[`FioConnectWalletConfirm should render with loading props 1`] = `
<View
style={
{
"flex": undefined,
"marginBottom": undefined,
"marginLeft": undefined,
"marginRight": undefined,
"marginTop": undefined,
"flex": 1,
"marginTop": 0,
"paddingBottom": 11,
"paddingLeft": 11,
"paddingRight": 11,
"paddingTop": 11,
"paddingHorizontal": 11,
}
}
>
Expand Down
139 changes: 67 additions & 72 deletions src/__tests__/scenes/__snapshots__/SwapConfirmationScene.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -273,97 +273,92 @@ exports[`SwapConfirmationScene should render with loading props 1`] = `
<View
style={
{
"flex": undefined,
"marginBottom": undefined,
"marginLeft": undefined,
"marginRight": undefined,
"marginTop": undefined,
"paddingBottom": 11,
"justifyContent": "center",
"overflow": "visible",
"paddingLeft": 11,
"paddingRight": 11,
"paddingTop": 11,
}
}
>
<View
style={
{
"justifyContent": "center",
"overflow": "visible",
"paddingBottom": 11,
"alignItems": "center",
"flexDirection": "row",
"justifyContent": "space-between",
"marginBottom": 11,
"marginHorizontal": 11,
}
}
>
<View
style={
{
"alignItems": "center",
"flexDirection": "row",
"justifyContent": "space-between",
"marginBottom": 11,
"marginHorizontal": 11,
}
}
>
<Text
adjustsFontSizeToFit={true}
allowFontScaling={false}
minimumFontScale={0.65}
numberOfLines={1}
style={
[
{
"color": "#FFFFFF",
"fontFamily": "Quicksand-Regular",
"fontSize": 22,
"includeFontPadding": false,
},
{
"fontFamily": "Quicksand-Medium",
"fontSize": 27,
},
null,
]
}
>
Exchange
</Text>
</View>
<BVLinearGradient
colors={
[
452984831,
452984831,
]
}
endPoint={
{
"x": 1,
"y": 0.5,
}
}
locations={null}
startPoint={
{
"x": 0,
"y": 0.5,
}
}
<Text
adjustsFontSizeToFit={true}
allowFontScaling={false}
minimumFontScale={0.65}
numberOfLines={1}
style={
[
{
"borderBottomColor": "rgba(255, 255, 255, .1)",
"borderBottomWidth": 1,
"height": 1,
"color": "#FFFFFF",
"fontFamily": "Quicksand-Regular",
"fontSize": 22,
"includeFontPadding": false,
},
{
"margin": 11,
"marginRight": -22,
"fontFamily": "Quicksand-Medium",
"fontSize": 27,
},
null,
]
}
/>
>
Exchange
</Text>
</View>
<BVLinearGradient
colors={
[
452984831,
452984831,
]
}
endPoint={
{
"x": 1,
"y": 0.5,
}
}
locations={null}
startPoint={
{
"x": 0,
"y": 0.5,
}
}
style={
[
{
"borderBottomColor": "rgba(255, 255, 255, .1)",
"borderBottomWidth": 1,
"height": 1,
},
{
"margin": 11,
"marginRight": -22,
},
]
}
/>
</View>
<View
style={
{
"flex": 1,
"marginTop": 0,
"paddingBottom": 11,
"paddingHorizontal": 11,
}
}
>
<View
collapsable={false}
entering={
Expand Down
10 changes: 2 additions & 8 deletions src/__tests__/scenes/__snapshots__/SwapCreateScene.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -272,18 +272,12 @@ exports[`SwapCreateScene should render with loading props 1`] = `
>
<View>
<View
expand={true}
style={
{
"flex": 1,
"marginBottom": undefined,
"marginLeft": undefined,
"marginRight": undefined,
"marginTop": undefined,
"marginTop": 0,
"paddingBottom": 11,
"paddingLeft": 11,
"paddingRight": 11,
"paddingTop": 11,
"paddingHorizontal": 11,
}
}
>
Expand Down
Loading
Loading