Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(swap): buy/to asset list check #2648

Merged
merged 4 commits into from
Aug 29, 2023
Merged

chore(swap): buy/to asset list check #2648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fca65a0
chore(swap): check but/to asset list
banklesss Aug 29, 2023
5376d38
chore(swap): check but/to asset list
banklesss Aug 29, 2023
fb087c5
Merge branch 'develop' into chore/swap-list-buy-check
banklesss Aug 29, 2023
56acb55
CR: update
banklesss Aug 29, 2023
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
2 changes: 1 addition & 1 deletion apps/wallet-mobile/src/components/BottomSheetModal/BottomSheetModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ const styles = StyleSheet.create({
justifyContent: 'flex-end',
},
sheetTitle: {
flex: 3,
flex: 4,
fontSize: 20,
fontWeight: 'bold',
color: '#242838',
Expand Down
6 changes: 6 additions & 0 deletions apps/wallet-mobile/src/features/Swap/common/strings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ export const useStrings = () => {
poolFee: intl.formatMessage(messages.poolFee),
batcherFee: intl.formatMessage(messages.batcherFee),
assets: (qty: number) => intl.formatMessage(globalMessages.assets, {qty}),
asset: intl.formatMessage(messages.asset),
volume: intl.formatMessage(messages.volume),
total: intl.formatMessage(globalMessages.total),
}
}
Expand Down Expand Up @@ -164,6 +166,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:
Expand Down
44 changes: 34 additions & 10 deletions ...n/CreateOrder/EditBuyAmount/SelectBuyTokenFromListScreen/SelectBuyTokenFromListScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,17 @@ export const SelectBuyTokenFromListScreen = () => {

<MyPortfolioCaption />

<Spacer height={24} />
<Spacer height={16} />

<View style={styles.labels}>
<Text style={styles.label}>{strings.asset}</Text>

<Text style={styles.label}>{strings.volume}</Text>
</View>

<Spacer height={16} />

<View style={styles.line} />

<Boundary>
<TokenList showOnlyVerifiedTokens={isOnlyVerifiedTokens} />
Expand All @@ -83,7 +93,7 @@ const VerifiedTokensToogle = ({onToogle, isToogled}: {onToogle: () => void; isTo
<Spacer width={8} />

<TouchableOpacity onPress={() => setShowVerifiedTokenInfo(true)}>
<Icon.Info size={24} />
<Icon.Info size={28} />
</TouchableOpacity>
</View>

Expand All @@ -105,7 +115,7 @@ const VerifiedTokenInfo = () => {
<View>
<Text style={styles.modalText}>{strings.poolVerificationInfo('MuesliSwap')}</Text>

<Spacer height={12} />
<Spacer height={28} />

<Text>
<Text style={styles.modalText}>{strings.eachVerifiedToken}</Text>
Expand All @@ -124,14 +134,12 @@ const MyPortfolioCaption = () => {
const strings = useStrings()

return (
<View>
<View style={[styles.row]}>
<Icon.Portfolio size={20} color={COLORS.LIGHT_GREEN} />
<View style={[styles.row]}>
<Icon.Portfolio size={20} color={COLORS.LIGHT_GREEN} />

<Spacer width={8} />
<Spacer width={8} />

<Text style={styles.topText}>{strings.assetsIn}</Text>
</View>
<Text style={styles.topText}>{strings.assetsIn}</Text>
</View>
)
}
Expand Down Expand Up @@ -319,14 +327,28 @@ 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,
},
list: {
flex: 1,
},

line: {
height: StyleSheet.hairlineWidth,
backgroundColor: '#DCE0E9',
},
counter: {
padding: 16,
justifyContent: 'center',
Expand Down Expand Up @@ -355,6 +377,8 @@ const styles = StyleSheet.create({
fontWeight: '400',
lineHeight: 20,
color: '#242838',
fontFamily: 'Rubik',
fontSize: 15,
},
image: {
flex: 1,
Expand Down
1 change: 1 addition & 0 deletions apps/wallet-mobile/src/i18n/locales/en-US.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,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",
"swap.swapScreen.tvl": " TVL",
"components.common.navigation.nftGallery": "NFT Gallery",
"components.receive.addressmodal.BIP32path": "Derivation path",
Expand Down