Skip to content

Commit 9b6f443

Browse files
committed
Address review comments
1 parent 60f5d1a commit 9b6f443

File tree

2 files changed

+45
-38
lines changed

2 files changed

+45
-38
lines changed

packages/browser-wallet/src/popup/popupX/page-layouts/MainLayout/Header/Header.scss

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,22 +229,28 @@
229229

230230
svg {
231231
display: unset;
232+
position: absolute;
233+
left: rem(12px);
232234
}
233235
}
234236
}
235237

236238
.account {
239+
flex: 1;
237240
display: flex;
238241
align-items: center;
239242

243+
.text__additional_small {
244+
text-align: left;
245+
}
246+
240247
svg {
241248
display: none;
242249
margin-right: rem(4px);
243250
}
244251
}
245252

246253
.balance {
247-
margin-left: auto;
248254
min-width: rem(65px);
249255
}
250256

@@ -254,7 +260,6 @@
254260
width: unset;
255261
min-width: rem(100px);
256262
justify-content: flex-end;
257-
margin-left: rem(16px);
258263

259264
.token-icon {
260265
display: flex;

packages/browser-wallet/src/popup/popupX/page-layouts/MainLayout/Header/components/AccountSelector.tsx

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -78,42 +78,44 @@ export default function AccountSelector({ showAccountSelector, onUpdateSelectedA
7878
onClick={() => setAscSort((a) => !a)}
7979
/>
8080
</div>
81-
{sorted.map((credential) => (
82-
<Button.Base
83-
className={clsx('main-header__account-selector_list-item', {
84-
active: credential.address === selectedAccount,
85-
})}
86-
onClick={onAccountClick(credential.address)}
87-
>
88-
<div className="account">
89-
{credential.address === selectedAccount && <CarretRight />}
90-
<span className="text__additional_small">{displayNameAndSplitAddress(credential)}</span>
91-
</div>
92-
<div className="balance">
93-
<span className="text__additional_small">
94-
<CcdBalance credential={credential} />
95-
</span>
96-
</div>
97-
<div className="tokens">
98-
{tokens.loading ||
99-
Object.values(tokens.value[credential.address]).flatMap((contractTokens) =>
100-
contractTokens.flatMap((token) =>
101-
token.metadata.thumbnail?.url === undefined
102-
? []
103-
: [
104-
<div className="token-icon">
105-
<Img
106-
src={token.metadata.thumbnail.url}
107-
alt={token.metadata.symbol ?? '?'}
108-
withDefaults
109-
/>
110-
</div>,
111-
]
112-
)
113-
)}
114-
</div>
115-
</Button.Base>
116-
))}
81+
<div className="main-header__account-selector_list">
82+
{sorted.map((credential) => (
83+
<Button.Base
84+
className={clsx('main-header__account-selector_list-item', {
85+
active: credential.address === selectedAccount,
86+
})}
87+
onClick={onAccountClick(credential.address)}
88+
>
89+
<div className="account">
90+
{credential.address === selectedAccount && <CarretRight />}
91+
<span className="text__additional_small">{displayNameAndSplitAddress(credential)}</span>
92+
</div>
93+
<div className="balance">
94+
<span className="text__additional_small">
95+
<CcdBalance credential={credential} />
96+
</span>
97+
</div>
98+
<div className="tokens">
99+
{tokens.loading ||
100+
Object.values(tokens.value[credential.address]).flatMap((contractTokens) =>
101+
contractTokens.flatMap((token) =>
102+
token.metadata.thumbnail?.url === undefined
103+
? []
104+
: [
105+
<div className="token-icon">
106+
<Img
107+
src={token.metadata.thumbnail.url}
108+
alt={token.metadata.symbol ?? '?'}
109+
withDefaults
110+
/>
111+
</div>,
112+
]
113+
)
114+
)}
115+
</div>
116+
</Button.Base>
117+
))}
118+
</div>
117119
</div>
118120
</div>
119121
);

0 commit comments

Comments
 (0)