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

Fix other networks section #5784

Merged
merged 1 commit into from
May 29, 2024
Merged

Fix other networks section #5784

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 19 additions & 9 deletions src/__swaps__/screens/Swap/components/TokenList/TokenToBuySection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import React, { useCallback } from 'react';
import { TextStyle } from 'react-native';
import { StyleSheet, TextStyle } from 'react-native';
import Animated, { useDerivedValue } from 'react-native-reanimated';
import { FlashList } from '@shopify/flash-list';

import * as i18n from '@/languages';
import { CoinRow } from '@/__swaps__/screens/Swap/components/CoinRow';
import { SearchAsset } from '@/__swaps__/types/search';
import { AnimatedText, Box, Inline, Inset, Stack, Text } from '@/design-system';
import { AnimatedText, Box, Inline, Inset, Stack, Text, useForegroundColor } from '@/design-system';
import { AssetToBuySection, AssetToBuySectionId } from '@/__swaps__/screens/Swap/hooks/useSearchCurrencyLists';
import { ChainId } from '@/__swaps__/types/chains';
import { TextColor } from '@/design-system/color/palettes';
Expand Down Expand Up @@ -42,12 +42,12 @@ const sectionProps: { [id in AssetToBuySectionId]: SectionProp } = {
unverified: {
title: i18n.t(i18n.l.token_search.section_header.unverified),
symbol: '􀇿',
color: 'background: rgba(255, 218, 36, 1)',
color: 'rgba(255, 218, 36, 1)',
},
other_networks: {
title: i18n.t(i18n.l.token_search.section_header.on_other_networks),
symbol: 'network',
color: 'labelTertiary',
symbol: '􀊝',
color: '',
},
};

Expand All @@ -68,6 +68,8 @@ const AnimatedFlashListComponent = Animated.createAnimatedComponent(FlashList<Se
export const TokenToBuySection = ({ section }: { section: AssetToBuySection }) => {
const { setAsset, selectedOutputChainId } = useSwapContext();

const label = useForegroundColor('label');

const handleSelectToken = useCallback(
(token: SearchAsset) => {
const userAsset = userAssetsStore.getState().getUserAsset(token.uniqueId);
Expand All @@ -91,7 +93,10 @@ export const TokenToBuySection = ({ section }: { section: AssetToBuySection }) =

const color = useDerivedValue(() => {
if (section.id !== 'bridge') {
return sectionProps[section.id].color as TextColor;
if (sectionProps[section.id].color) {
return sectionProps[section.id].color as TextColor;
}
return label as TextColor;
}

return bridgeSectionsColorsByChain[selectedOutputChainId.value || ChainId.mainnet] as TextColor;
Expand All @@ -105,9 +110,8 @@ export const TokenToBuySection = ({ section }: { section: AssetToBuySection }) =
{section.id === 'other_networks' ? (
<Box borderRadius={12} height={{ custom: 52 }}>
<Inset horizontal="20px" vertical="8px">
<Inline space="8px" alignVertical="center">
{/* <SwapCoinIcon /> */}
<Text size="icon 14px" weight="semibold" color={'labelQuaternary'}>
<Inline space="8px" alignHorizontal="center" alignVertical="center">
<Text color="labelTertiary" size="17pt" weight="semibold">
{i18n.t(i18n.l.swap.tokens_input.nothing_found)}
</Text>
</Inline>
Expand Down Expand Up @@ -154,3 +158,9 @@ export const TokenToBuySection = ({ section }: { section: AssetToBuySection }) =
</Box>
);
};

export const styles = StyleSheet.create({
solidColorCoinIcon: {
opacity: 0.4,
},
});
Loading