From fca65a050c88efe65a3ec0d0d073b536263182f1 Mon Sep 17 00:00:00 2001 From: Javier Bueno Date: Tue, 29 Aug 2023 18:46:24 +0200 Subject: [PATCH 1/3] chore(swap): check but/to asset list --- .../src/features/Swap/common/strings.ts | 6 +++ .../SelectBuyTokenFromListScreen.tsx | 40 ++++++++++++++----- .../wallet-mobile/src/i18n/locales/en-US.json | 1 + 3 files changed, 38 insertions(+), 9 deletions(-) diff --git a/apps/wallet-mobile/src/features/Swap/common/strings.ts b/apps/wallet-mobile/src/features/Swap/common/strings.ts index f4acb20bdb..2d63bc60bd 100644 --- a/apps/wallet-mobile/src/features/Swap/common/strings.ts +++ b/apps/wallet-mobile/src/features/Swap/common/strings.ts @@ -52,6 +52,8 @@ export const useStrings = () => { found: intl.formatMessage(messages.found), youHave: intl.formatMessage(messages.youHave), assets: (qty: number) => intl.formatMessage(globalMessages.assets, {qty}), + asset: intl.formatMessage(messages.asset), + volume: intl.formatMessage(messages.volume), } } @@ -159,6 +161,10 @@ export const messages = defineMessages({ id: 'swap.swapScreen.poolVerification', defaultMessage: '!!!{pool} verification', }, + volume: { + id: 'swap.swapScreen.volume', + defaultMessage: '!!!Volume, 24h', + }, poolVerificationInfo: { id: 'swap.swapScreen.poolVerificationInfo', defaultMessage: diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx index 7faf34021a..3cfe223489 100644 --- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx +++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx @@ -60,7 +60,17 @@ export const SelectBuyTokenFromListScreen = () => { - + + + + {strings.asset} + + {strings.volume} + + + + + @@ -83,7 +93,7 @@ const VerifiedTokensToogle = ({onToogle, isToogled}: {onToogle: () => void; isTo setShowVerifiedTokenInfo(true)}> - + @@ -124,14 +134,12 @@ const MyPortfolioCaption = () => { const strings = useStrings() return ( - - - + + - + - {strings.assetsIn} - + {strings.assetsIn} ) } @@ -319,6 +327,17 @@ const styles = StyleSheet.create({ item: { paddingVertical: 14, }, + label: { + fontFamily: 'Rubik', + fontSize: 12, + fontStyle: 'normal', + fontWeight: '400', + lineHeight: 18, + }, + labels: { + flexDirection: 'row', + justifyContent: 'space-between', + }, borderBottom: { borderBottomColor: COLORS.BORDER_GRAY, borderBottomWidth: StyleSheet.hairlineWidth, @@ -326,7 +345,10 @@ const styles = StyleSheet.create({ list: { flex: 1, }, - + line: { + height: StyleSheet.hairlineWidth, + backgroundColor: '#DCE0E9', + }, counter: { padding: 16, justifyContent: 'center', diff --git a/apps/wallet-mobile/src/i18n/locales/en-US.json b/apps/wallet-mobile/src/i18n/locales/en-US.json index a3e55f3763..8b6b05e8c3 100644 --- a/apps/wallet-mobile/src/i18n/locales/en-US.json +++ b/apps/wallet-mobile/src/i18n/locales/en-US.json @@ -151,6 +151,7 @@ "swap.swapScreen.swapMinReceivedTitle": "Min Received", "swap.swapScreen.enterSlippage": "Enter a value from 0% to 100%. You can also enter up to 1 decimal", "swap.swapScreen.poolVerification": "{pool} verification", + "swap.swapScreen.volume": "Volume, 24h", "components.common.navigation.nftGallery": "NFT Gallery", "components.receive.addressmodal.BIP32path": "Derivation path", "components.receive.addressmodal.copiedLabel": "Copied", From 5376d385b5de7d0d3bade2d17c5877315c07fba5 Mon Sep 17 00:00:00 2001 From: Javier Bueno Date: Tue, 29 Aug 2023 19:01:14 +0200 Subject: [PATCH 2/3] chore(swap): check but/to asset list --- .../src/components/BottomSheetModal/BottomSheetModal.tsx | 2 +- .../SelectBuyTokenFromListScreen.tsx | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/wallet-mobile/src/components/BottomSheetModal/BottomSheetModal.tsx b/apps/wallet-mobile/src/components/BottomSheetModal/BottomSheetModal.tsx index 770933a15a..235e4c7239 100644 --- a/apps/wallet-mobile/src/components/BottomSheetModal/BottomSheetModal.tsx +++ b/apps/wallet-mobile/src/components/BottomSheetModal/BottomSheetModal.tsx @@ -113,7 +113,7 @@ const styles = StyleSheet.create({ justifyContent: 'flex-end', }, sheetTitle: { - flex: 3, + flex: 4, fontSize: 20, fontWeight: 'bold', color: '#242838', diff --git a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx index 3cfe223489..49b9ff480a 100644 --- a/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx +++ b/apps/wallet-mobile/src/features/Swap/useCases/StartSwapScreen/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx @@ -115,7 +115,7 @@ const VerifiedTokenInfo = () => { {strings.poolVerificationInfo('MuesliSwap')} - + {strings.eachVerifiedToken} @@ -377,6 +377,8 @@ const styles = StyleSheet.create({ fontWeight: '400', lineHeight: 20, color: '#242838', + fontFamily: 'Rubik', + fontSize: 15, }, image: { flex: 1, From 56acb558b5f8f9e9d80e4f1f02cbc70230fc96f0 Mon Sep 17 00:00:00 2001 From: Javier Bueno Date: Tue, 29 Aug 2023 19:09:49 +0200 Subject: [PATCH 3/3] CR: update --- apps/wallet-mobile/src/i18n/locales/en-US.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/wallet-mobile/src/i18n/locales/en-US.json b/apps/wallet-mobile/src/i18n/locales/en-US.json index 07a73960ae..2a726a4c21 100644 --- a/apps/wallet-mobile/src/i18n/locales/en-US.json +++ b/apps/wallet-mobile/src/i18n/locales/en-US.json @@ -154,7 +154,7 @@ "swap.swapScreen.enterSlippage": "Enter a value from 0% to 100%. You can also enter up to 1 decimal", "swap.swapScreen.poolVerification": "{pool} verification", "swap.swapScreen.volume": "Volume, 24h", - "swap.swapScreen.tvl": " TVL", + "swap.swapScreen.tvl": " TVL", "components.common.navigation.nftGallery": "NFT Gallery", "components.receive.addressmodal.BIP32path": "Derivation path", "components.receive.addressmodal.copiedLabel": "Copied",