From 4e392e11612341e3cdeceb83814bd8eda381dda0 Mon Sep 17 00:00:00 2001 From: dreacot Date: Wed, 25 Sep 2024 19:22:57 +0100 Subject: [PATCH] don't show bottom nav in wallet page --- ui/page/governance/proposal_vote_modal.go | 4 ++-- ui/page/root/overview_page.go | 8 ++++---- ui/page/root/wallet_selector_page.go | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ui/page/governance/proposal_vote_modal.go b/ui/page/governance/proposal_vote_modal.go index a85bfd03f..388c239a4 100644 --- a/ui/page/governance/proposal_vote_modal.go +++ b/ui/page/governance/proposal_vote_modal.go @@ -189,10 +189,10 @@ func (vm *voteModal) Handle(gtx C) { vm.Dismiss() selectedWallet, _ := vm.walletSelector.selectedWallet.(*dcr.Asset) walletCallbackFunc := func() { - vm.ParentNavigator().CloseCurrentPage() + vm.ParentWindow().CloseCurrentPage() } swmp := wallet.NewSingleWalletMasterPage(vm.Load, selectedWallet, walletCallbackFunc) - vm.ParentNavigator().Display(swmp) + vm.ParentWindow().Display(swmp) swmp.Display(staking.NewStakingPage(vm.Load, selectedWallet)) // Display staking page on the main page.] swmp.PageNavigationTab.SetSelectedSegment(values.String(values.StrStaking)) } diff --git a/ui/page/root/overview_page.go b/ui/page/root/overview_page.go index 651094d59..9a26f2aea 100644 --- a/ui/page/root/overview_page.go +++ b/ui/page/root/overview_page.go @@ -260,10 +260,10 @@ func (pg *OverviewPage) HandleUserInteractions(gtx C) { pg.showNavigationFunc(true) walletCallbackFunc := func() { pg.showNavigationFunc(false) - pg.ParentNavigator().CloseCurrentPage() + pg.ParentWindow().CloseCurrentPage() } swmp := wallet.NewSingleWalletMasterPage(pg.Load, selectedWallet, walletCallbackFunc) - pg.ParentNavigator().Display(swmp) + pg.ParentWindow().Display(swmp) swmp.Display(privacy.NewAccountMixerPage(pg.Load, selectedWallet)) // Display mixer page on the main page. swmp.PageNavigationTab.SetSelectedSegment(values.String(values.StrStakeShuffle)) } @@ -276,10 +276,10 @@ func (pg *OverviewPage) HandleUserInteractions(gtx C) { pg.showNavigationFunc(true) callback := func() { pg.showNavigationFunc(false) - pg.ParentNavigator().CloseCurrentPage() + pg.ParentWindow().CloseCurrentPage() } swmp := wallet.NewSingleWalletMasterPage(pg.Load, info.GetWallet(), callback) - pg.ParentNavigator().Display(swmp) + pg.ParentWindow().Display(swmp) } } } diff --git a/ui/page/root/wallet_selector_page.go b/ui/page/root/wallet_selector_page.go index 92c87c258..ce976bc4e 100644 --- a/ui/page/root/wallet_selector_page.go +++ b/ui/page/root/wallet_selector_page.go @@ -184,9 +184,9 @@ func (pg *WalletSelectorPage) HandleUserInteractions(gtx C) { pg.showNavigationFunc(true) callback := func() { - pg.ParentNavigator().CloseCurrentPage() + pg.ParentWindow().CloseCurrentPage() } - pg.ParentNavigator().Display(wallet.NewSingleWalletMasterPage(pg.Load, selectedWallet, callback)) + pg.ParentWindow().Display(wallet.NewSingleWalletMasterPage(pg.Load, selectedWallet, callback)) } for _, walletsOfType := range pg.badWalletsList {