Skip to content

frontend: use sat spacing in all-accounts #3426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

frontend: use sat spacing in all-accounts #3426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions frontends/web/src/components/amount/amount-with-unit.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
cursor: default;
line-height: 1;
margin: 0;
max-width: 100%;
white-space: nowrap;
}

Expand Down
5 changes: 4 additions & 1 deletion frontends/web/src/components/amount/amount-with-unit.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import { isBitcoinCoin } from '@/routes/account/utils';
import style from './amount-with-unit.module.css';

type TAmountWithUnitProps = {
amount: TAmountWithConversions;
amount: TAmountWithConversions | undefined;
tableRow?: boolean;
enableRotateUnit?: boolean;
sign?: string;
Expand All @@ -41,6 +41,9 @@ export const AmountWithUnit = ({
}: TAmountWithUnitProps) => {
const { rotateDefaultCurrency, defaultCurrency, rotateBtcUnit } = useContext(RatesContext);

if (!amount) {
return null;
}
let displayedAmount: string = '';
let displayedUnit: CoinUnit | ConversionUnit;
let onClick: () => Promise<void>;
Expand Down
12 changes: 0 additions & 12 deletions frontends/web/src/routes/accounts/all-accounts.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,18 +62,6 @@
justify-content: flex-end;
}

.accountBalance {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
margin-right: 4px;
}

.coinUnit {
flex-shrink: 0;
white-space: nowrap;
}

.chevron {
margin-top: 6px;
color: var(--color-mediumgray);
Expand Down
23 changes: 9 additions & 14 deletions frontends/web/src/routes/accounts/all-accounts.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
* limitations under the License.
*/

import { useState, useEffect } from 'react';
import { useTranslation } from 'react-i18next';
import { Link } from 'react-router-dom';
import { useState, useEffect, useContext } from 'react';
import { useOnlyVisitableOnMobile } from '@/hooks/onlyvisitableonmobile';
import * as accountApi from '@/api/account';
import { getBalance } from '@/api/account';
Expand All @@ -27,16 +27,20 @@ import { HideAmountsButton } from '@/components/hideamountsbutton/hideamountsbut
import { Main, Header } from '@/components/layout';
import { Badge } from '@/components/badge/badge';
import { ChevronRightDark, USBSuccess } from '@/components/icon/icon';
import { AppContext } from '@/contexts/AppContext';
import { AllAccountsGuide } from '@/routes/accounts/all-accounts-guide';
import { useMountedRef } from '@/hooks/mount';
import { AmountWithUnit } from '@/components/amount/amount-with-unit';
import styles from './all-accounts.module.css';

type AllAccountsProps = {
accounts?: accountApi.IAccount[];
};

const AccountItem = ({ account, hideAmounts }: { account: accountApi.IAccount, hideAmounts: boolean }) => {
type TAccountItemProp = {
account: accountApi.IAccount;
};

const AccountItem = ({ account }: TAccountItemProp) => {
const [balance, setBalance] = useState<accountApi.TAmountWithConversions>();
const mounted = useMountedRef();

Expand Down Expand Up @@ -70,12 +74,7 @@ const AccountItem = ({ account, hideAmounts }: { account: accountApi.IAccount, h
</p>

<div className={styles.accountBalanceContainer}>
<div className={styles.accountBalance}>
{balance ? (hideAmounts ? '***' : balance.amount) : '...'}
</div>
<div className={styles.coinUnit}>
{balance ? balance.unit : ''}
</div>
<AmountWithUnit amount={balance} />
</div>
<div className={styles.chevron}>
<ChevronRightDark />
Expand All @@ -84,18 +83,15 @@ const AccountItem = ({ account, hideAmounts }: { account: accountApi.IAccount, h
);
};


/**
* This component will only be shown on mobile.
**/
export const AllAccounts = ({ accounts = [] }: AllAccountsProps) => {
const { t } = useTranslation();
const { hideAmounts } = useContext(AppContext);
const accountsByKeystore = getAccountsByKeystore(accounts);
useOnlyVisitableOnMobile('/settings/manage-accounts');

return (

<Main>
<Header title={<h2>{t('account.accounts')}</h2>}>
<HideAmountsButton />
Expand Down Expand Up @@ -124,7 +120,7 @@ export const AllAccounts = ({ accounts = [] }: AllAccountsProps) => {
</div>
<div className={styles.accountsList}>
{keystore.accounts.map(account => (
<AccountItem hideAmounts={hideAmounts} key={`account-${account.code}`} account={account} />
<AccountItem key={`account-${account.code}`} account={account} />
))}
</div>
</div>
Expand All @@ -134,6 +130,5 @@ export const AllAccounts = ({ accounts = [] }: AllAccountsProps) => {
</View>
<AllAccountsGuide />
</Main >

);
};