-
Notifications
You must be signed in to change notification settings - Fork 82
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'frontend-revamp-send-summary'
- Loading branch information
Showing
8 changed files
with
395 additions
and
60 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletions
65
frontends/web/src/routes/account/send/components/confirm/confirm.module.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| .bitBoxContainer { | ||
| margin-bottom: var(--space-half); | ||
| } | ||
|
|
||
| .confirmationItemWrapper { | ||
| align-items: baseline; | ||
| display: flex; | ||
| justify-content: space-between; | ||
| } | ||
|
|
||
| .confirmItem { | ||
| margin-bottom: calc(var(--space-half) + var(--space-quarter)); | ||
| } | ||
|
|
||
| .confirmItem p { | ||
| margin: 0; | ||
| word-break: break-all; | ||
| } | ||
|
|
||
| .confirmItem ul { | ||
| list-style-type: square; | ||
| margin: 0; | ||
| margin-top: var(--space-quarter); | ||
| padding-left: var(--space-half); | ||
| } | ||
|
|
||
| .fiatValue { | ||
| color: var(--color-default); | ||
| } | ||
|
|
||
| .unit { | ||
| color: var(--color-secondary); | ||
| font-size: var(--size-default); | ||
| } | ||
|
|
||
| label { | ||
| color: var(--color-secondary); | ||
| margin: 0 !important; | ||
| } | ||
|
|
||
| .title { | ||
| text-align: center; | ||
| } | ||
|
|
||
| .totalWrapper { | ||
| align-items: baseline; | ||
| display: flex; | ||
| } | ||
|
|
||
| .totalWrapper .fiatValue { | ||
| margin-left: auto; | ||
| } | ||
|
|
||
| .totalWrapper label { | ||
| margin-right: var(--space-quarter) !important; | ||
| } | ||
|
|
||
| .valueOriginal { | ||
| font-weight: 500; | ||
| } | ||
|
|
||
| .valueOriginalLarge { | ||
| font-size: var(--header-default-font-size); | ||
| font-weight: 500; | ||
| } |
227 changes: 227 additions & 0 deletions
227
frontends/web/src/routes/account/send/components/confirm/confirm.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,227 @@ | ||
| /** | ||
| * Copyright 2024 Shift Crypto AG | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| import { useTranslation } from 'react-i18next'; | ||
| import { ConversionUnit } from '@/api/account'; | ||
| import { Amount } from '@/components/amount/amount'; | ||
| import { customFeeUnit } from '@/routes/account/utils'; | ||
| import { View, ViewContent, ViewHeader } from '@/components/view/view'; | ||
| import { Message } from '@/components/message/message'; | ||
| import { PointToBitBox02 } from '@/components/icon'; | ||
| import { TConfirmSendProps } from '@/routes/account/send/components/confirm/types'; | ||
| import { ConfirmingWaitDialog } from '@/routes/account/send/components/confirm/dialogs/confirm-wait-dialog'; | ||
| import style from './confirm.module.css'; | ||
|
|
||
| type TFiatValueProps = { | ||
| baseCurrencyUnit: ConversionUnit; | ||
| amount: string | ||
| } | ||
|
|
||
| export const ConfirmSend = (props: TConfirmSendProps) => { | ||
| const { device, ...bb01Props } = props; | ||
| const { paired, ...bb02Props } = bb01Props; | ||
|
|
||
| switch (props.device) { | ||
| case 'bitbox': | ||
| return ( | ||
| <ConfirmingWaitDialog | ||
| {...bb01Props} | ||
| /> | ||
| ); | ||
| case 'bitbox02': | ||
| return ( | ||
| <BB02ConfirmSend | ||
| {...bb02Props} | ||
| /> | ||
| ); | ||
| default: | ||
| return null; | ||
| } | ||
| }; | ||
|
|
||
| export const BB02ConfirmSend = ({ | ||
| baseCurrencyUnit, | ||
| note, | ||
| hasSelectedUTXOs, | ||
| selectedUTXOs, | ||
| coinCode, | ||
| transactionStatus, | ||
| transactionDetails | ||
| }: Omit<TConfirmSendProps, 'device' | 'paired'>) => { | ||
|
|
||
| const { t } = useTranslation(); | ||
| const { isConfirming, signProgress } = transactionStatus; | ||
| const { | ||
| proposedFee, | ||
| proposedAmount, | ||
| proposedTotal, | ||
| customFee, | ||
| feeTarget, | ||
| recipientAddress, | ||
| fiatUnit | ||
| } = transactionDetails; | ||
|
|
||
|
|
||
| const confirmPrequel = (signProgress && signProgress.steps > 0) ? ( | ||
| <div className="m-top-none m-bottom-half"> | ||
| <span> | ||
| { | ||
| t('send.signprogress.description', { | ||
| steps: signProgress.steps.toString(), | ||
| }) | ||
| } | ||
| <br /> | ||
| {t('send.signprogress.label')}: {signProgress.step}/{signProgress.steps} | ||
| </span> | ||
| </div> | ||
| ) : undefined; | ||
|
|
||
|
|
||
| if (!isConfirming) { | ||
| return null; | ||
| } | ||
|
|
||
| const canShowSendAmountFiatValue = proposedAmount && proposedAmount.conversions && proposedAmount.conversions[fiatUnit]; | ||
| const canShowFeeFiatValue = proposedFee && proposedFee.conversions && proposedFee.conversions[fiatUnit]; | ||
| const canShowTotalFiatValue = (proposedTotal && proposedTotal.conversions) && proposedTotal.conversions[fiatUnit]; | ||
|
|
||
|
|
||
| return ( | ||
| <View fullscreen width="740px"> | ||
| <ViewHeader title={<div className={style.title}>{t('send.confirm.title')}</div>} /> | ||
| <ViewContent> | ||
| {confirmPrequel} | ||
| <Message type="info"> | ||
| {t('send.confirm.infoMessage')} | ||
| </Message> | ||
| <div className={style.bitBoxContainer}> | ||
| <PointToBitBox02 /> | ||
| </div> | ||
|
|
||
| {/*Send amount*/} | ||
| <div className={style.confirmItem}> | ||
| <label>{t('button.send')}</label> | ||
| <div className={style.confirmationItemWrapper}> | ||
| <p className={style.valueOriginalLarge}> | ||
| {(proposedAmount && | ||
| <Amount alwaysShowAmounts amount={proposedAmount.amount} unit={proposedAmount.unit}/>) || 'N/A'} | ||
| {' '} | ||
| <span className={style.unit}> | ||
| {(proposedAmount && proposedAmount.unit) || 'N/A'} | ||
| </span> | ||
| </p> | ||
| {canShowSendAmountFiatValue && | ||
| (<FiatValue baseCurrencyUnit={baseCurrencyUnit} amount={proposedAmount.conversions![fiatUnit] || ''} />) | ||
| } | ||
| </div> | ||
| </div> | ||
|
|
||
| {/*To (recipient address)*/} | ||
| <div className={style.confirmItem}> | ||
| <label>{t('send.confirm.to')}</label> | ||
| <div className={style.confirmationItemWrapper}> | ||
| <p className={`${style.valueOriginal}`}> | ||
| {recipientAddress || 'N/A'} | ||
| </p> | ||
| </div> | ||
| </div> | ||
|
|
||
| {/*Note*/} | ||
| {note ? ( | ||
| <div className={style.confirmItem}> | ||
| <label>{t('note.title')}</label> | ||
| <p className={style.valueOriginal}>{note}</p> | ||
| </div> | ||
| ) : null} | ||
|
|
||
| {/*Selected UTXOs*/} | ||
| { | ||
| hasSelectedUTXOs && ( | ||
| <div className={style.confirmItem}> | ||
| <label>{t('send.confirm.selected-coins')}</label> | ||
| <ul> | ||
| { | ||
| selectedUTXOs.map((uxto, i) => ( | ||
| <li className={style.valueOriginal} key={`selectedCoin-${i}`}>{uxto}</li> | ||
| )) | ||
| } | ||
|
|
||
| </ul> | ||
|
|
||
| </div> | ||
| ) | ||
| } | ||
|
|
||
|
|
||
| {/*Fee*/} | ||
| <div className={style.confirmItem}> | ||
| <label>{t('send.fee.label')}{feeTarget ? ' (' + t(`send.feeTarget.label.${feeTarget}`) + ')' : ''}</label> | ||
| <div className={style.confirmationItemWrapper}> | ||
| <p className={style.valueOriginal}> | ||
| {(proposedFee && | ||
| <Amount alwaysShowAmounts amount={proposedFee.amount} unit={proposedFee.unit}/>) || 'N/A'} {' '} | ||
| <span className={style.unit}> | ||
| {(proposedFee && proposedFee.unit) || 'N/A'} | ||
| </span> | ||
| {customFee ? ( | ||
| <small> | ||
| <br/> | ||
| ({customFee} {customFeeUnit(coinCode)}) | ||
| </small> | ||
| ) : null} | ||
| </p> | ||
| {canShowFeeFiatValue && ( | ||
| <FiatValue baseCurrencyUnit={baseCurrencyUnit} amount={proposedFee.conversions![fiatUnit] || ''} /> | ||
| )} | ||
| </div> | ||
| </div> | ||
|
|
||
| {/*Total*/} | ||
| <div className={style.confirmItem}> | ||
| <div className={style.totalWrapper}> | ||
| <label>{t('send.confirm.total')}</label> | ||
| <p className={style.valueOriginal}> | ||
| <strong> | ||
| {(proposedTotal && | ||
| <Amount alwaysShowAmounts amount={proposedTotal.amount} unit={proposedTotal.unit}/>) || 'N/A'} | ||
| </strong> | ||
| {' '} | ||
| <span className={style.unit}>{(proposedTotal && proposedTotal.unit) || 'N/A'}</span> | ||
| </p> | ||
| {canShowTotalFiatValue && | ||
| (<FiatValue baseCurrencyUnit={baseCurrencyUnit} amount={proposedTotal.conversions![fiatUnit] || ''} />) | ||
| } | ||
| </div> | ||
| </div> | ||
|
|
||
| </ViewContent> | ||
| </View> | ||
| ); | ||
|
|
||
| }; | ||
|
|
||
|
|
||
| const FiatValue = ({ baseCurrencyUnit, amount }: TFiatValueProps) => { | ||
| return ( | ||
| <p className={style.fiatValue}> | ||
| <span> | ||
| <Amount alwaysShowAmounts amount={amount} unit={baseCurrencyUnit} /> | ||
| {' '}<span className={style.unit}>{baseCurrencyUnit}</span> | ||
| </span> | ||
| </p> | ||
| ) | ||
| ; | ||
| }; |
18 changes: 18 additions & 0 deletions
18
...nds/web/src/routes/account/send/components/confirm/dialogs/confirm-wait-dialog.module.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| .confirmItem p { | ||
| margin-top: var(--space-quarter); | ||
| word-break: break-all; | ||
| } | ||
|
|
||
| .confirmationValue { | ||
| font-size: var(--size-default); | ||
| font-weight: 400; | ||
| line-height: 1; | ||
| overflow: hidden; | ||
| text-overflow: ellipsis; | ||
| direction: rtl; | ||
| } | ||
|
|
||
| .total p { | ||
| font-size: var(--size-subheader) !important; | ||
| margin-bottom: var(--space-quarter); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.