Skip to content
This repository was archived by the owner on Mar 2, 2026. It is now read-only.

fixed: wallet tab redirect and coinlist ui scroll height #1199

Merged
zzggo merged 5 commits into from
Jul 22, 2025
Merged

fixed: wallet tab redirect and coinlist ui scroll height #1199

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
902661c
fixed: wallet tab redirect and coinlist ui scroll height
Jul 21, 2025
c219687
Merge branch 'dev' into 1198-bug-fresh-install-not-redirecting-to-wel…
Jul 22, 2025
6f17749
fixed: revert return
Jul 22, 2025
c057f20
Update private route so that it opens welcome page in a tab
tombeckenham Jul 22, 2025
a868e11
Changed to min height
tombeckenham Jul 22, 2025
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 src/ui/views/Dashboard/wallet-tab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ const WalletTab = ({ network }) => {
flexDirection: 'column',
backgroundColor: 'black',
width: '100%',
height: '100%',
height: 'auto',
}}
>
<Tabs
Expand Down
10 changes: 8 additions & 2 deletions src/ui/views/SortHat.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ const SortHat = () => {
let approval = await getApproval();
if (!wallet) {
setTo('/unlock');
return;

@github-actions github-actions Bot Jul 21, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The early return after setTo('/unlock') could lead to skipping important initialization logic. Consider whether any cleanup or state updates need to be performed before returning.

}

if (isInNotification && !approval) {
Expand All @@ -35,8 +36,13 @@ const SortHat = () => {
approval = undefined;
}

if (!(await wallet.isBooted()) && !isInTab) {
openInternalPageInTab('welcome');
// For fresh installation, go to welcome page regardless of popup/tab mode
if (!(await wallet.isBooted())) {
if (isInTab) {
setTo('/welcome');
} else {
openInternalPageInTab('welcome');
}
return;
}

Expand Down
Loading