diff --git a/apps/wallet-mobile/src/TxHistory/PairedBalance.tsx b/apps/wallet-mobile/src/TxHistory/PairedBalance.tsx index b41ff8f368..32cb9e7294 100644 --- a/apps/wallet-mobile/src/TxHistory/PairedBalance.tsx +++ b/apps/wallet-mobile/src/TxHistory/PairedBalance.tsx @@ -98,7 +98,7 @@ const useStrings = () => { const styles = StyleSheet.create({ pairedBalanceText: { - fontSize: 14, + fontSize: 12, lineHeight: 24, fontFamily: 'Rubik-Regular', color: COLORS.TEXT_INPUT, diff --git a/apps/wallet-mobile/src/components/AmountItem/AmountItem.tsx b/apps/wallet-mobile/src/components/AmountItem/AmountItem.tsx index 60fb652b9d..515d0cab87 100644 --- a/apps/wallet-mobile/src/components/AmountItem/AmountItem.tsx +++ b/apps/wallet-mobile/src/components/AmountItem/AmountItem.tsx @@ -120,7 +120,7 @@ const styles = StyleSheet.create({ }, name: { color: COLORS.DARK_TEXT, - fontSize: 14, + fontSize: 16, lineHeight: 22, fontWeight: '500', fontFamily: 'Rubik-Medium', @@ -134,6 +134,8 @@ const styles = StyleSheet.create({ quantity: { color: COLORS.DARK_TEXT, textAlign: 'right', + fontSize: 16, + fontFamily: 'Rubik-Regular', }, row: { flexDirection: 'row', diff --git a/apps/wallet-mobile/src/features/Swap/common/SelectPool/SelectPoolFromList/SelectPoolFromList.tsx b/apps/wallet-mobile/src/features/Swap/common/SelectPool/SelectPoolFromList/SelectPoolFromList.tsx index b654a819dc..0c4195a91a 100644 --- a/apps/wallet-mobile/src/features/Swap/common/SelectPool/SelectPoolFromList/SelectPoolFromList.tsx +++ b/apps/wallet-mobile/src/features/Swap/common/SelectPool/SelectPoolFromList/SelectPoolFromList.tsx @@ -16,7 +16,7 @@ import {PoolIcon} from '../../PoolIcon/PoolIcon' import {useStrings} from '../../strings' import {useSwapForm} from '../../SwapFormProvider' -const PRECISION = 14 +const PRECISION = 10 type Props = { pools?: ReadonlyArray @@ -59,6 +59,7 @@ export const SelectPoolFromList = ({pools = []}: Props) => { const formattedTvl = Quantities.format(tvl, decimals, 0) const formattedBatcherFeeInPt = Quantities.format(pool.batcherFee.quantity, decimals, decimals) const marketPrice = getMarketPrice(pool, orderData.amounts.sell.tokenId) + const selectedPoolId = selectedCardIndex ?? orderData?.bestPoolCalculation?.pool?.poolId ?? null return ( @@ -66,7 +67,7 @@ export const SelectPoolFromList = ({pools = []}: Props) => { handleOnPoolSelection(pool)} style={[styles.card]}> @@ -190,6 +191,9 @@ const styles = StyleSheet.create({ }, infoLabel: { color: '#6B7384', + fontSize: 16, + }, + infoValue: { + fontSize: 16, }, - infoValue: {}, }) diff --git a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.tsx b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.tsx index 985fce3f52..40ae21b0cb 100644 --- a/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.tsx +++ b/apps/wallet-mobile/src/features/Swap/useCases/ConfirmTxScreen/ShowSubmittedTxScreen/ShowSubmittedTxScreen.tsx @@ -1,6 +1,7 @@ import {createTypeGuardFromSchema, isString} from '@yoroi/common' import React from 'react' import {Linking, StyleSheet, View} from 'react-native' +import {SafeAreaView} from 'react-native-safe-area-context' import {z} from 'zod' import {Button, Spacer, Text} from '../../../../../components' @@ -30,33 +31,35 @@ export const ShowSubmittedTxScreen = () => { } return ( - - + + + - {strings.transactionSigned} + {strings.transactionSigned} - {strings.transactionDisplay} + {strings.transactionDisplay} - + - {isString(params?.txId) && ( -