From 761577981572ce8403fcf753bf434c44f538010d Mon Sep 17 00:00:00 2001 From: banklesss Date: Fri, 20 Dec 2024 11:24:35 +0100 Subject: [PATCH 1/4] fix(wallet-mobile): portfolio sync issues --- apps/wallet-mobile/src/features/Menu/Menu.tsx | 4 ++-- .../DashboardTokensList/DashboardTokensList.tsx | 3 ++- .../PortfolioTokenDetailsScreen.tsx | 12 +++++++++++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/apps/wallet-mobile/src/features/Menu/Menu.tsx b/apps/wallet-mobile/src/features/Menu/Menu.tsx index 37d1a1a3fa..76f0d493b9 100644 --- a/apps/wallet-mobile/src/features/Menu/Menu.tsx +++ b/apps/wallet-mobile/src/features/Menu/Menu.tsx @@ -89,7 +89,7 @@ export const Menu = () => { /> )} - { onPress={navigateTo.catalystVoting} left={} /> - + */} { const isPreprod = network === Chain.Network.Preprod const tokensList = React.useMemo(() => balances.fts ?? [], [balances.fts]) + const isJustADA = React.useMemo(() => { - if (tokensList.length >= 2) return false + if (tokensList?.[0] == null || tokensList.length >= 2) return false const tokenInfo = tokensList[0].info const isPrimary = isPrimaryToken(tokenInfo) return isPrimary diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenDetailsScreen.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenDetailsScreen.tsx index 82dc7a6cc3..c70d9e68e6 100644 --- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenDetailsScreen.tsx +++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioTokenDetails/PortfolioTokenDetailsScreen.tsx @@ -1,3 +1,4 @@ +import {usePortfolioTokenInfo} from '@yoroi/portfolio' import {useTheme} from '@yoroi/theme' import {App} from '@yoroi/types' import * as React from 'react' @@ -28,7 +29,16 @@ export const PortfolioTokenDetailsScreen = () => { const [isStickyTab, setIsStickyTab] = React.useState(false) const {id: tokenId} = usePortfolioTokenDetailParams() const {wallet} = useSelectedWallet() - const tokenInfo = wallet.balances.records.get(tokenId)?.info + const {tokenInfo} = usePortfolioTokenInfo( + { + getTokenInfo: wallet.networkManager.tokenManager.api.tokenInfo, + id: tokenId, + network: wallet.networkManager.network, + primaryTokenInfo: wallet.portfolioPrimaryTokenInfo, + }, + {suspense: true}, + ) + const HEADER_HEIGHT = 304 const {styles} = useStyles(HEADER_HEIGHT) From 77e7038d74ce0afd6471ceaae7181776778e4475 Mon Sep 17 00:00:00 2001 From: banklesss Date: Fri, 20 Dec 2024 11:26:17 +0100 Subject: [PATCH 2/4] fix(wallet-mobile): portfolio sync issues --- apps/wallet-mobile/src/features/Menu/Menu.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/wallet-mobile/src/features/Menu/Menu.tsx b/apps/wallet-mobile/src/features/Menu/Menu.tsx index 76f0d493b9..37d1a1a3fa 100644 --- a/apps/wallet-mobile/src/features/Menu/Menu.tsx +++ b/apps/wallet-mobile/src/features/Menu/Menu.tsx @@ -89,7 +89,7 @@ export const Menu = () => { /> )} - {/* { onPress={navigateTo.catalystVoting} left={} /> - */} + Date: Fri, 20 Dec 2024 11:44:31 +0100 Subject: [PATCH 3/4] Update apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/DashboardTokensList.tsx Signed-off-by: banklesss <105349292+banklesss@users.noreply.github.com> --- .../DashboardTokensList/DashboardTokensList.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/DashboardTokensList.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/DashboardTokensList.tsx index 4433208847..b5ff7eabd4 100644 --- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/DashboardTokensList.tsx +++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/DashboardTokensList.tsx @@ -32,7 +32,7 @@ export const DashboardTokensList = () => { const tokensList = React.useMemo(() => balances.fts ?? [], [balances.fts]) const isJustADA = React.useMemo(() => { - if (tokensList?.[0] == null || tokensList.length >= 2) return false + if (tokenList.length !== 1) return false const tokenInfo = tokensList[0].info const isPrimary = isPrimaryToken(tokenInfo) return isPrimary From 2f3b944fde5fb5f3ea9e2c03ac1b6a7b5a4e22e1 Mon Sep 17 00:00:00 2001 From: banklesss Date: Fri, 20 Dec 2024 11:55:14 +0100 Subject: [PATCH 4/4] fix(wallet-mobile): portfolio sync issues --- .../DashboardTokensList/DashboardTokensList.tsx | 2 +- apps/wallet-mobile/src/yoroi-wallets/cardano/cardano-wallet.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/DashboardTokensList.tsx b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/DashboardTokensList.tsx index b5ff7eabd4..dfa45bf7d9 100644 --- a/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/DashboardTokensList.tsx +++ b/apps/wallet-mobile/src/features/Portfolio/useCases/PortfolioDashboard/DashboardTokensList/DashboardTokensList.tsx @@ -32,7 +32,7 @@ export const DashboardTokensList = () => { const tokensList = React.useMemo(() => balances.fts ?? [], [balances.fts]) const isJustADA = React.useMemo(() => { - if (tokenList.length !== 1) return false + if (tokensList.length !== 1) return false const tokenInfo = tokensList[0].info const isPrimary = isPrimaryToken(tokenInfo) return isPrimary diff --git a/apps/wallet-mobile/src/yoroi-wallets/cardano/cardano-wallet.ts b/apps/wallet-mobile/src/yoroi-wallets/cardano/cardano-wallet.ts index be7833c2da..15f54fe9dc 100644 --- a/apps/wallet-mobile/src/yoroi-wallets/cardano/cardano-wallet.ts +++ b/apps/wallet-mobile/src/yoroi-wallets/cardano/cardano-wallet.ts @@ -718,7 +718,7 @@ export const makeCardanoWallet = (networkManager: Network.Manager, implementatio async resync() { await this.clear() - return this.sync() + return this.sync({isForced: true}) } // end sync