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.

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

feat(swaps): add dropdown network filter #5174

Merged
merged 31 commits into from
Mar 28, 2024
Merged
Show file tree
Hide file tree
Changes from 25 commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
1678f42
initial
jh2oman Mar 18, 2024
0b0236b
further along
jh2oman Mar 21, 2024
4c86600
done
jh2oman Mar 21, 2024
4e5dd8d
Merge branch 'main' into multi-select
jh2oman Mar 22, 2024
cf7c171
mistaken commits
jh2oman Mar 22, 2024
37ccf85
Merge branch 'main' into multi-select
jh2oman Mar 22, 2024
19246b5
feedback
jh2oman Mar 22, 2024
5c6cc46
Merge branch 'main' into multi-select
jh2oman Mar 22, 2024
c16d834
knip
jh2oman Mar 22, 2024
d0d9f3d
nit, iOS fix
jh2oman Mar 25, 2024
392c3c8
attempt 2
jh2oman Mar 25, 2024
2cd31f9
Merge branch 'main' into multi-select
jh2oman Mar 25, 2024
46e1e73
Merge branch 'main' into multi-select
jh2oman Mar 25, 2024
1bd6170
change setSelectedOptions and unit tests
jh2oman Mar 25, 2024
058267c
Merge branch 'main' into multi-select
jh2oman Mar 25, 2024
ce48752
unused export
jh2oman Mar 25, 2024
b882b99
feat(swaps): add dropdown network filter
jh2oman Mar 26, 2024
5b349bf
Merge branch 'main' of github.com:valora-inc/wallet into swap-network
jh2oman Mar 26, 2024
1632f29
improvements
jh2oman Mar 26, 2024
dfe0c6f
analytics
jh2oman Mar 26, 2024
e3cba51
type narrowing helper
jh2oman Mar 26, 2024
5893800
simplify isSelected
jh2oman Mar 26, 2024
3693300
unit tests
jh2oman Mar 27, 2024
25c2ecf
Merge branch 'main' into swap-network
jh2oman Mar 27, 2024
91f60ff
fix done button
jh2oman Mar 27, 2024
e0c7e1a
feedback
jh2oman Mar 28, 2024
2dcdb88
Merge branch 'main' into swap-network
jh2oman Mar 28, 2024
9d655a5
Merge branch 'main' into swap-network
jh2oman Mar 28, 2024
b1a8ac8
re-order params
jh2oman Mar 28, 2024
1a4e2e9
Merge branch 'main' into swap-network
jh2oman Mar 28, 2024
36d0ba0
Merge branch 'main' into swap-network
jh2oman Mar 28, 2024
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 locales/base/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -1926,7 +1926,7 @@
"myTokens": "My tokens",
"popular": "Popular",
"recentlySwapped": "Recently swapped",
"network": "{{networkName}} Network"
"network": "Network"
satish-ravi marked this conversation as resolved.
Show resolved Hide resolved
}
},
"homeActions": {
Expand Down
1 change: 1 addition & 0 deletions src/analytics/Events.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -591,6 +591,7 @@ export enum TokenBottomSheetEvents {
search_token = 'search_token',
token_selected = 'token_selected',
toggle_tokens_filter = 'toggle_tokens_filter',
network_filter_updated = 'network_filter_updated',
}

export enum AssetsEvents {
Expand Down
7 changes: 5 additions & 2 deletions src/analytics/Properties.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import {
OnboardingEvents,
PerformanceEvents,
PhoneVerificationEvents,
PointsEvents,
QrScreenEvents,
RewardsEvents,
SendEvents,
Expand All @@ -42,7 +43,6 @@ import {
TransactionEvents,
WalletConnectEvents,
WebViewEvents,
PointsEvents,
} from 'src/analytics/Events'
import {
BackQuizProgress,
Expand All @@ -67,13 +67,13 @@ import { LocalCurrencyCode } from 'src/localCurrency/consts'
import { NftOrigin } from 'src/nfts/types'
import { NotificationReceiveState } from 'src/notifications/types'
import { AdventureCardName } from 'src/onboarding/types'
import { PointsActivity } from 'src/points/types'
import { RecipientType } from 'src/recipients/recipient'
import { QrCode } from 'src/send/types'
import { Field } from 'src/swap/types'
import { TokenDetailsActionName } from 'src/tokens/types'
import { NetworkId, TokenTransactionTypeV2, TransactionStatus } from 'src/transactions/types'
import { Currency } from 'src/utils/currencies'
import { PointsActivity } from 'src/points/types'

type Web3LibraryProps = { web3Library: 'contract-kit' | 'viem' }

Expand Down Expand Up @@ -1361,6 +1361,9 @@ interface TokenBottomSheetEventsProperties {
isRemoving: boolean
isPreSelected: boolean
}
[TokenBottomSheetEvents.network_filter_updated]: {
selectedNetworkIds: NetworkId[]
satish-ravi marked this conversation as resolved.
Show resolved Hide resolved
}
[TokenBottomSheetEvents.token_selected]: {
origin: TokenPickerOrigin
tokenId: string
Expand Down
5 changes: 3 additions & 2 deletions src/analytics/docs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import {
AssetsEvents,
AuthenticationEvents,
BuilderHooksEvents,
CICOEvents,
CeloExchangeEvents,
CeloNewsEvents,
CICOEvents,
CoinbasePayEvents,
ContractKitEvents,
DappExplorerEvents,
Expand All @@ -26,6 +26,7 @@ import {
OnboardingEvents,
PerformanceEvents,
PhoneVerificationEvents,
PointsEvents,
QrScreenEvents,
RewardsEvents,
SendEvents,
Expand All @@ -36,7 +37,6 @@ import {
TransactionEvents,
WalletConnectEvents,
WebViewEvents,
PointsEvents,
} from 'src/analytics/Events'

/**
Expand Down Expand Up @@ -542,6 +542,7 @@ export const eventDocs: Record<AnalyticsEventType, string> = {
[TokenBottomSheetEvents.search_token]: `When a user searches a token using the token bottom sheet search box`,
[TokenBottomSheetEvents.token_selected]: `A token was selected in TokenBottomSheet.`,
[TokenBottomSheetEvents.toggle_tokens_filter]: `A filter was selected in the TokenBottomSheet.`,
[TokenBottomSheetEvents.network_filter_updated]: `The network filter was updated and the multiselect UI closed in the TokenBottomSheet.`,
[AssetsEvents.show_asset_balance_info]: `When a user taps on the info icon`,
[AssetsEvents.view_wallet_assets]: `When a user taps on the "Wallet Assets" segmented control or "Assets" tab`,
[AssetsEvents.view_collectibles]: `When a user taps on the "Collectibles" tab`,
Expand Down
51 changes: 41 additions & 10 deletions src/components/FilterChipsCarousel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,32 @@ import React from 'react'
import { StyleProp, StyleSheet, Text, View, ViewStyle } from 'react-native'
import { ScrollView } from 'react-native-gesture-handler'
import Touchable from 'src/components/Touchable'
import DownArrowIcon from 'src/icons/DownArrowIcon'
import colors from 'src/styles/colors'
import { typeScale } from 'src/styles/fonts'
import { Spacing } from 'src/styles/styles'
import { NetworkId } from 'src/transactions/types'

export interface FilterChip<T> {
interface BaseFilterChip {
id: string
name: string
filterFn: (t: T) => boolean
isSelected: boolean
}
export interface BooleanFilterChip<T> extends BaseFilterChip {
filterFn: (t: T) => boolean
}

export interface NetworkFilterChip<T> extends BaseFilterChip {
filterFn: (t: T, n: NetworkId[]) => boolean
allNetworkIds: NetworkId[]
selectedNetworkIds: NetworkId[]
}

export function isNetworkChip<T>(chip: FilterChip<T>): chip is NetworkFilterChip<T> {
return 'allNetworkIds' in chip
}

export type FilterChip<T> = BooleanFilterChip<T> | NetworkFilterChip<T>

interface Props<T> {
chips: FilterChip<T>[]
Expand Down Expand Up @@ -58,14 +74,24 @@ function FilterChipsCarousel<T>({
}}
style={styles.filterChip}
>
<Text
style={[
styles.filterChipText,
chip.isSelected ? { color: secondaryColor } : { color: primaryColor },
]}
>
{chip.name}
</Text>
<View style={styles.filterChipTextWrapper}>
<Text
style={[
styles.filterChipText,
chip.isSelected ? { color: secondaryColor } : { color: primaryColor },
]}
>
{chip.name}
</Text>
{isNetworkChip(chip) && (
<DownArrowIcon
color={chip.isSelected ? secondaryColor : primaryColor}
strokeWidth={2}
height={Spacing.Regular16}
style={{ marginBottom: 2, marginLeft: 4 }}
/>
)}
</View>
</Touchable>
</View>
)
Expand Down Expand Up @@ -97,6 +123,11 @@ const styles = StyleSheet.create({
filterChipText: {
...typeScale.labelXSmall,
},
filterChipTextWrapper: {
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'center',
},
})

export default FilterChipsCarousel
Loading
Loading