Skip to content
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

feat(staking): total stake pending align #12

Closed
wants to merge 2 commits into from
+84 −78
Closed

feat(staking): total stake pending align #12

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ef4a6b
feat(staking): total stake pending align
EvgeniiVoznyuk Apr 24, 2024
4e9ccd7
fix(total stake pending align): added tooltip and trimmed amount
EvgeniiVoznyuk Apr 28, 2024
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 packages/suite/src/support/messages.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8783,7 +8783,7 @@ export default defineMessages({
},
TR_STAKE_TOTAL_PENDING: {
id: 'TR_STAKE_TOTAL_PENDING',
defaultMessage: 'Total stake pending:',
defaultMessage: 'Total stake pending',
},
TR_STAKE_LAST_STAKE_REQUEST_STATE: {
id: 'TR_STAKE_LAST_STAKE_REQUEST_STATE',
Expand Down
94 changes: 29 additions & 65 deletions .../suite/src/views/wallet/staking/components/EthStakingDashboard/components/StakingCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,33 +18,15 @@ const StyledCard = styled(Card)`
padding: ${spacingsPx.md};
`;

const EnteringAmountInfo = styled.div`
display: flex;
justify-content: space-between;
align-items: center;
gap: ${spacingsPx.xxs};
flex-wrap: wrap;
padding: ${spacingsPx.xxxs} ${spacingsPx.xs} ${spacingsPx.sm} ${spacingsPx.xs};
font-size: ${variables.FONT_SIZE.SMALL};
`;

const EnteringAmountsWrapper = styled.div`
font-size: ${variables.FONT_SIZE.NORMAL};
`;

const EnteringFiatValueWrapper = styled.span`
color: ${({ theme }) => theme.textSubdued};
`;

const AmountsWrapper = styled.div<{ $isUnstakePending: boolean }>`
const AmountsWrapper = styled.div<{ $isStakeOrUnstakePending: boolean }>`
display: flex;
gap: ${spacingsPx.sm} ${spacingsPx.xs};
flex-wrap: wrap;
justify-content: ${({ $isUnstakePending }) =>
$isUnstakePending ? 'space-between' : 'flex-start'};
justify-content: ${({ $isStakeOrUnstakePending }) =>
$isStakeOrUnstakePending ? 'space-between' : 'flex-start'};

& > div {
flex: ${({ $isUnstakePending }) => ($isUnstakePending ? '' : '1 0 300px')};
flex: ${({ $isStakeOrUnstakePending }) => ($isStakeOrUnstakePending ? '' : '1 0 300px')};
}
`;

Expand Down Expand Up @@ -82,14 +64,6 @@ const Info = styled.div`
color: ${({ theme }) => theme.textSubdued};
`;

const NoMarginInfo = styled(Info)`
margin: 0;
`;

const SmMarginInfo = styled(Info)`
margin: 0 0 ${spacingsPx.xxxs} ${spacingsPx.xs};
`;

const ButtonsWrapper = styled.div`
margin-top: 66px;
display: flex;
Expand Down Expand Up @@ -171,52 +145,42 @@ export const StakingCard = ({
<StyledCard>
{(isStakeConfirming || isTxStatusShown) && (
<InfoBox>
<EnteringAmountInfo>
<Translation
id="TR_STAKE_WAITING_TO_BE_ADDED"
values={{ symbol: selectedAccount?.symbol?.toUpperCase(), br: <br /> }}
/>

<EnteringAmountsWrapper>
<NoMarginInfo>
<Icon icon="CLOCK" size={12} />
<Translation id="TR_STAKE_TOTAL_PENDING" />
</NoMarginInfo>

<div>
<FormattedCryptoAmount
value={totalPendingStakeBalance}
symbol={selectedAccount?.symbol}
/>{' '}
<EnteringFiatValueWrapper>
<FiatValue
amount={totalPendingStakeBalance}
symbol={selectedAccount?.symbol}
showApproximationIndicator
>
{({ value }) => value && <span>({value})</span>}
</FiatValue>
</EnteringFiatValueWrapper>
</div>
</EnteringAmountsWrapper>
</EnteringAmountInfo>

<SmMarginInfo>
<Icon icon="INFO" size={12} />
<Translation id="TR_STAKE_LAST_STAKE_REQUEST_STATE" />
</SmMarginInfo>
<ProgressLabels labels={progressLabelsData} />
</InfoBox>
)}

<AmountsWrapper $isUnstakePending={isPendingUnstakeShown}>
<AmountsWrapper $isStakeOrUnstakePending={isPendingUnstakeShown || isStakePending}>
{isStakePending && (
<div>
<AmountHeading>
<Icon icon="SPINNER" size={16} />
<Translation id="TR_STAKE_TOTAL_PENDING" />
</AmountHeading>

<StyledFormattedCryptoAmount
isBalance
value={totalPendingStakeBalance}
symbol={selectedAccount?.symbol}
/>

<StyledFiatValue
amount={totalPendingStakeBalance}
symbol={selectedAccount?.symbol}
showApproximationIndicator
>
{({ value }) => (value ? <span>{value}</span> : null)}
</StyledFiatValue>
</div>
)}

<div>
<AmountHeading>
<Icon icon="LOCK_SIMPLE" size={16} />
<Translation id="TR_STAKE_STAKE" />
</AmountHeading>

<StyledFormattedCryptoAmount
isBalance
value={depositedBalance}
symbol={selectedAccount?.symbol}
/>
Expand Down
Loading