From 21d034324c32f2790eb9e7226ecd57d8ba5b7cbd Mon Sep 17 00:00:00 2001 From: Sorin Chis Date: Fri, 27 Sep 2024 12:29:56 +0300 Subject: [PATCH 1/6] remove red border --- .../app/containers/wallet/WalletDelegationBanner.js | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/packages/yoroi-extension/app/containers/wallet/WalletDelegationBanner.js b/packages/yoroi-extension/app/containers/wallet/WalletDelegationBanner.js index a8e839b3f9..5b45d1ca2b 100644 --- a/packages/yoroi-extension/app/containers/wallet/WalletDelegationBanner.js +++ b/packages/yoroi-extension/app/containers/wallet/WalletDelegationBanner.js @@ -101,14 +101,8 @@ function WalletDelegationBanner({ - - + + {intl.formatMessage(emptyDashboardMessages.title, { ticker })} @@ -210,7 +204,6 @@ const WrapperBanner = styled(Box)({ padding: '24px', borderRadius: '8px', overflowY: 'hidden', - border: '2px solid red', }); const AvatarWrapper = styled(Box)({ From bf73dfc9c274648841951ed3b2e03cf3941ef35b Mon Sep 17 00:00:00 2001 From: Sorin Chis Date: Fri, 27 Sep 2024 12:54:22 +0300 Subject: [PATCH 2/6] fix text --- .../WalletSendFormSteps/AssetsDropdown.js | 4 +- .../WalletSendPreviewStep.js | 56 ++++++++++++------- 2 files changed, 39 insertions(+), 21 deletions(-) diff --git a/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/AssetsDropdown.js b/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/AssetsDropdown.js index c8e38bda0f..f054cb0959 100644 --- a/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/AssetsDropdown.js +++ b/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/AssetsDropdown.js @@ -65,7 +65,9 @@ export default class AssetsDropdown extends Component { {token.label} -
{displayAmount}
+ + {displayAmount} + ); }); diff --git a/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/WalletSendPreviewStep.js b/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/WalletSendPreviewStep.js index 527e7c5f5d..bc634d6a6a 100644 --- a/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/WalletSendPreviewStep.js +++ b/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/WalletSendPreviewStep.js @@ -33,6 +33,8 @@ import AssetsDropdown from './AssetsDropdown'; import LoadingSpinner from '../../../widgets/LoadingSpinner'; import { SEND_FORM_STEP } from '../../../../types/WalletSendTypes'; import { ReactComponent as AttentionIcon } from '../../../../assets/images/attention-modern.inline.svg'; +import { fontWeight } from '../../../../styles/themes/tokens/tokens'; +import { fontSize } from '../../../../styles/themes/tokens/tokens'; const SBox = styled(Box)(({ theme }) => ({ background: theme.palette.ds.bg_gradient_3, @@ -217,21 +219,33 @@ export default class WalletSendPreviewStep extends Component { const { unitOfAccountSetting } = this.props; return unitOfAccountSetting.enabled ? ( - <> -
- {formatValue(entry)} -  {truncateToken(getTokenName(this.props.getTokenInfo(entry)))} -
-
- {this.convertedToUnitOfAccount(entry, unitOfAccountSetting.currency)} -  {unitOfAccountSetting.currency} -
- + + + + {formatValue(entry)} + + +  {truncateToken(getTokenName(this.props.getTokenInfo(entry)))} + + + + + {this.convertedToUnitOfAccount(entry, unitOfAccountSetting.currency)} + + +  {unitOfAccountSetting.currency} + + + ) : ( -
- {formatValue(entry)} -  {truncateToken(getTokenName(this.props.getTokenInfo(entry)))} -
+ + + {formatValue(entry)} + + +  {truncateToken(getTokenName(this.props.getTokenInfo(entry)))} + + ); }; renderSingleFee: TokenEntry => Node = entry => { @@ -497,19 +511,21 @@ export default class WalletSendPreviewStep extends Component { -
{intl.formatMessage(globalMessages.walletSendConfirmationTotalLabel)}
+ + {intl.formatMessage(globalMessages.walletSendConfirmationTotalLabel)} +
- - {this.renderTotalAmount(this.props.totalAmount.getDefaultEntry())} - + {/* */} + {this.renderTotalAmount(this.props.totalAmount.getDefaultEntry())} + {/* */} {amount.nonDefaultEntries().length > 0 && ( -
+ {intl.formatMessage(messages.nAssets, { number: amount.nonDefaultEntries().length, })} -
+ )}
From aba875848ffc5032f3421b75dfb273055f8b10f7 Mon Sep 17 00:00:00 2001 From: Sorin Chis Date: Fri, 27 Sep 2024 13:06:39 +0300 Subject: [PATCH 3/6] fix nft default image position --- .../app/components/wallet/assets/NFTDetails.js | 3 ++- .../app/components/wallet/assets/NFTsList.js | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/yoroi-extension/app/components/wallet/assets/NFTDetails.js b/packages/yoroi-extension/app/components/wallet/assets/NFTDetails.js index b83a481d35..7a73eccb15 100644 --- a/packages/yoroi-extension/app/components/wallet/assets/NFTDetails.js +++ b/packages/yoroi-extension/app/components/wallet/assets/NFTDetails.js @@ -190,10 +190,11 @@ function NFTDetails({ nftInfo, network, intl, nextNftId, prevNftId, tab }: Props objectFit: 'unset', }, backgroundColor: 'ds.bg_color_max', + height: '100%', }} onClick={() => nftImage !== null && setOpenAndTrack()} > - + diff --git a/packages/yoroi-extension/app/components/wallet/assets/NFTsList.js b/packages/yoroi-extension/app/components/wallet/assets/NFTsList.js index 88039cd147..329b9ff1f4 100644 --- a/packages/yoroi-extension/app/components/wallet/assets/NFTsList.js +++ b/packages/yoroi-extension/app/components/wallet/assets/NFTsList.js @@ -206,13 +206,11 @@ export function NftImage({ name, width, height, - contentHeight, }: {| imageUrl: ?string, name: string, width: string, height: string, - contentHeight?: string, |}): Node { const [loading, setLoading] = useState(true); const [error, setError] = useState(false); @@ -235,7 +233,7 @@ export function NftImage({ if (error || url === null) return ( - + ); @@ -266,7 +264,7 @@ function NftCardImage({ ipfsUrl, name }: {| ipfsUrl: string | null, name: string return ( - + Date: Fri, 27 Sep 2024 13:17:44 +0300 Subject: [PATCH 4/6] fix swap text color --- .../containers/swap/asset-swap/ConfirmSwapTransaction.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/yoroi-extension/app/containers/swap/asset-swap/ConfirmSwapTransaction.js b/packages/yoroi-extension/app/containers/swap/asset-swap/ConfirmSwapTransaction.js index e222317301..b438c10365 100644 --- a/packages/yoroi-extension/app/containers/swap/asset-swap/ConfirmSwapTransaction.js +++ b/packages/yoroi-extension/app/containers/swap/asset-swap/ConfirmSwapTransaction.js @@ -182,9 +182,9 @@ export default function ConfirmSwapTransaction({ - Total + Total - + {formattedNonPtAmount ?? formattedPtAmount} @@ -192,14 +192,14 @@ export default function ConfirmSwapTransaction({ {formattedNonPtAmount && ( - + {formattedPtAmount} )} - + {getFormattedPairingValue(ptAmount)} From b810d224f49677442f19e0ba54d74afcbaffe2db Mon Sep 17 00:00:00 2001 From: Sorin Chis Date: Fri, 27 Sep 2024 13:25:51 +0300 Subject: [PATCH 5/6] upgrade bg gradient on light theme --- .../app/styles/themes/base-palettes/light-palette.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/yoroi-extension/app/styles/themes/base-palettes/light-palette.js b/packages/yoroi-extension/app/styles/themes/base-palettes/light-palette.js index 3d6241b298..7c2ec6cc89 100644 --- a/packages/yoroi-extension/app/styles/themes/base-palettes/light-palette.js +++ b/packages/yoroi-extension/app/styles/themes/base-palettes/light-palette.js @@ -51,7 +51,7 @@ export const lightPalette = { sys_orange_500: '#ED8600', sys_orange_100: '#FFF2E2', - bg_gradient_1: 'linear-gradient(180deg, #93F5E1 100%, #E4E8F7 100%)', + bg_gradient_1: 'linear-gradient(312deg, #C6F7ED 0%, #E4E8F7 70.58%)', bg_gradient_2: 'linear-gradient(206deg, rgba(11, 153, 125, 0.48) -10.43%, rgba(8, 194, 157, 0.08) 100%)', bg_gradient_3: 'linear-gradient(180deg, #244ABF 100%, #4760FF 100%)', special_web_overlay: 'rgba(31, 35, 46, 0.80)', From 487bfbd050cc0e6d05aebb206c8093af4cfc7d19 Mon Sep 17 00:00:00 2001 From: vantuz-subhuman Date: Fri, 27 Sep 2024 19:14:10 +0300 Subject: [PATCH 6/6] lint fixes --- .../wallet/send/WalletSendFormSteps/WalletSendPreviewStep.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/WalletSendPreviewStep.js b/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/WalletSendPreviewStep.js index bc634d6a6a..2841901c8b 100644 --- a/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/WalletSendPreviewStep.js +++ b/packages/yoroi-extension/app/components/wallet/send/WalletSendFormSteps/WalletSendPreviewStep.js @@ -33,8 +33,6 @@ import AssetsDropdown from './AssetsDropdown'; import LoadingSpinner from '../../../widgets/LoadingSpinner'; import { SEND_FORM_STEP } from '../../../../types/WalletSendTypes'; import { ReactComponent as AttentionIcon } from '../../../../assets/images/attention-modern.inline.svg'; -import { fontWeight } from '../../../../styles/themes/tokens/tokens'; -import { fontSize } from '../../../../styles/themes/tokens/tokens'; const SBox = styled(Box)(({ theme }) => ({ background: theme.palette.ds.bg_gradient_3,