feat(web3Hub): add recently used #8050
+347
−31
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| import { AppManifest } from "@ledgerhq/live-common/wallet-api/types"; | ||
| import { Flex, IconsLegacy, Text } from "@ledgerhq/native-ui"; | ||
| import { useTheme } from "@react-navigation/native"; | ||
| import React from "react"; | ||
| import { Image, TouchableOpacity, View } from "react-native"; | ||
|
|
||
| export default function RecentCard({ | ||
| item, | ||
| onPress, | ||
| onClosePress, | ||
| }: { | ||
| item: AppManifest; | ||
| onPress: () => void; | ||
| onClosePress: () => void; | ||
| }) { | ||
| const { colors } = useTheme(); | ||
|
|
||
| return ( | ||
| <TouchableOpacity onPress={onPress}> | ||
| <Flex | ||
| bg={colors.lightGrey} | ||
| flexDirection={"row"} | ||
| mx={"6px"} | ||
| px={4} | ||
| py={1} | ||
| justifyContent={"center"} | ||
| alignItems={"center"} | ||
| height={45} | ||
| borderRadius={16} | ||
| columnGap={10} | ||
| > | ||
| {!item.icon ? ( | ||
| <Image | ||
| style={{ height: 20, width: 20, borderRadius: 4 }} | ||
| source={{ | ||
| uri: item.icon!, | ||
| }} | ||
| /> | ||
| ) : ( | ||
| <View style={{ height: 20, width: 20, borderRadius: 4, backgroundColor: colors.black }} /> | ||
| )} | ||
| <Text fontWeight="semiBold" variant="body" color={colors.black}> | ||
| {item.name} | ||
| </Text> | ||
| <TouchableOpacity onPress={onClosePress}> | ||
| <IconsLegacy.CloseMedium size={18} color={colors.grey} /> | ||
| </TouchableOpacity> | ||
| </Flex> | ||
| </TouchableOpacity> | ||
| ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| import { AppManifest } from "@ledgerhq/live-common/wallet-api/types"; | ||
| import { Box, Flex, Text } from "@ledgerhq/native-ui"; | ||
| import { useTheme } from "@react-navigation/native"; | ||
| import { FlashList } from "@shopify/flash-list"; | ||
| import React, { useCallback } from "react"; | ||
| import { StyleSheet, TouchableOpacity, View } from "react-native"; | ||
| import { NavigatorName, ScreenName } from "~/const"; | ||
| import { SearchProps } from "~/newArch/features/Web3Hub/types"; | ||
| import RecentCard from "./RecentCard"; | ||
| import useRecentlyUsedViewModel, { | ||
| useRecentlyUsedViewModelExtraData, | ||
| } from "./useRecentlyUsedViewModel"; | ||
|
|
||
| const identityFn = (item: AppManifest) => item.id; | ||
|
|
||
| type Props = { | ||
| navigation: SearchProps["navigation"]; | ||
| }; | ||
|
|
||
| const renderItem = ({ | ||
| item, | ||
| extraData, | ||
| }: { | ||
| item: AppManifest; | ||
| extraData?: useRecentlyUsedViewModelExtraData; | ||
| }) => { | ||
| return ( | ||
| <RecentCard | ||
| onPress={() => extraData?.onPressItem(item)} | ||
| onClosePress={() => extraData?.onCloseItem(item)} | ||
| item={item} | ||
| /> | ||
| ); | ||
| }; | ||
|
|
||
| export default function RecentlyUsed({ navigation }: Props) { | ||
| const { colors } = useTheme(); | ||
|
|
||
| const goToApp = useCallback( | ||
| (manifestId: string) => { | ||
| navigation.push(NavigatorName.Web3Hub, { | ||
| screen: ScreenName.Web3HubApp, | ||
| params: { | ||
| manifestId: manifestId, | ||
| }, | ||
| }); | ||
| }, | ||
| [navigation], | ||
| ); | ||
|
|
||
| const { data, extraData, clearAll } = useRecentlyUsedViewModel(goToApp); | ||
|
|
||
| if (!data?.length) return null; | ||
|
|
||
| return ( | ||
| <View | ||
| style={{ | ||
| flex: 1, | ||
| borderBottomWidth: 2, | ||
| borderBottomColor: colors.lightGrey, | ||
| paddingBottom: 15, | ||
| }} | ||
| > | ||
| <Flex flexDirection={"row"} px={5} mb={2} mt={6} justifyContent={"space-between"} height={32}> | ||
| <Text variant="h5" color={colors.black}> | ||
| {"Recently used"} | ||
| </Text> | ||
| <TouchableOpacity onPress={clearAll}> | ||
| <Text fontWeight="semiBold" variant="body" color={"primary.c80"}> | ||
| {"Clear all"} | ||
| </Text> | ||
| </TouchableOpacity> | ||
| </Flex> | ||
|
|
||
| <FlashList | ||
| testID="web3hub-recently-used" | ||
| horizontal | ||
| contentContainerStyle={styles.container} | ||
| keyExtractor={identityFn} | ||
| renderItem={renderItem} | ||
| ListEmptyComponent={<Box height={50} />} | ||
| estimatedItemSize={50} | ||
| data={data} | ||
| showsHorizontalScrollIndicator={false} | ||
| extraData={extraData} | ||
| /> | ||
| </View> | ||
| ); | ||
| } | ||
|
|
||
| const styles = StyleSheet.create({ | ||
| container: { | ||
| paddingHorizontal: 5, | ||
| }, | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,66 @@ | ||
| import { AppManifest } from "@ledgerhq/live-common/wallet-api/types"; | ||
| import { INITIAL_WEB3HUB_STATE, WEB3HUB_STORE_KEY } from "LLM/features/Web3Hub/constants"; | ||
| import { Web3HubDB } from "LLM/features/Web3Hub/types"; | ||
| import { useCallback } from "react"; | ||
| import { useDB } from "~/db"; | ||
|
|
||
| export type useRecentlyUsedViewModelExtraData = { | ||
| onPressItem: (manifest: AppManifest) => void; | ||
| onCloseItem: (manifest: AppManifest) => void; | ||
| }; | ||
|
|
||
| const recentlyUsedSelector = (state: Web3HubDB) => state.recentlyUsed; | ||
|
|
||
| export function useRecentlyUsed() { | ||
| return useDB<Web3HubDB, Web3HubDB["recentlyUsed"]>( | ||
| WEB3HUB_STORE_KEY, | ||
| INITIAL_WEB3HUB_STATE, | ||
| recentlyUsedSelector, | ||
| ); | ||
| } | ||
|
|
||
| export default function useRecentlyUsedViewModel(goToApp: (manifestId: string) => void) { | ||
| const [recentlyUsed, setWeb3HubDB] = useRecentlyUsed(); | ||
|
|
||
| const onPressItem = useCallback( | ||
| (manifest: AppManifest) => { | ||
| goToApp(manifest.id); | ||
| }, | ||
| [goToApp], | ||
| ); | ||
|
|
||
| const onCloseItem = (manifest: AppManifest) => { | ||
| setWeb3HubDB(state => ({ | ||
| ...state, | ||
| recentlyUsed: state.recentlyUsed.filter(i => i.id !== manifest.id), | ||
| })); | ||
| }; | ||
|
|
||
| const clearAll = useCallback(() => { | ||
| setWeb3HubDB(state => ({ | ||
| ...state, | ||
| recentlyUsed: [], | ||
| })); | ||
| // eslint-disable-next-line react-hooks/exhaustive-deps | ||
| }, []); | ||
|
|
||
| const addToRecentlyUsed = (manifest: AppManifest) => { | ||
| setWeb3HubDB(state => { | ||
| const rest = state.recentlyUsed.filter(r => r.id !== manifest.id); | ||
| return { | ||
| ...state, | ||
| recentlyUsed: [manifest, ...rest], | ||
| }; | ||
| }); | ||
| }; | ||
|
|
||
| return { | ||
| data: recentlyUsed, | ||
| clearAll, | ||
| addToRecentlyUsed, | ||
| extraData: { | ||
| onPressItem, | ||
| onCloseItem, | ||
| }, | ||
| }; | ||
| } |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You want to revert this change, the simplest way is usually to do a
git checkout develop apps/ledger-live-mobile/ios/ledgerlivemobile.xcodeproj/project.pbxprojThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also it happens if we have xcode 16 installed I think and you can use https://github.com/XcodesOrg/xcodes to download any version like the 15.4 we currently use for develop and on CI (actually it's 15.3 I think)