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

Jump to bottom

[Wallet] aum / WALL-2271 / fix-ui-crypto-deposit #10850

Merged
merged 13 commits into from
Oct 25, 2023
Merged

[Wallet] aum / WALL-2271 / fix-ui-crypto-deposit #10850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ef89579
fix: fixed some UI styles
aum-deriv Oct 20, 2023
39afc0e
Merge branch 'master' of github.com:binary-com/deriv-app into aum/WAL…
aum-deriv Oct 23, 2023
e742ccd
chore: fixed some more UI elements
aum-deriv Oct 23, 2023
244ed23
Merge branch 'master' of github.com:binary-com/deriv-app into aum/WAL…
aum-deriv Oct 23, 2023
68c3c21
Merge branch 'master' of github.com:binary-com/deriv-app into aum/WAL…
aum-deriv Oct 24, 2023
3e8162f
chore: removed redundant styling
aum-deriv Oct 24, 2023
bdf785d
chore: replaced units with rem
aum-deriv Oct 24, 2023
2d990be
Merge branch 'master' of github.com:binary-com/deriv-app into aum/WAL…
aum-deriv Oct 24, 2023
1f80812
chore: replaced p tag with WalletText
aum-deriv Oct 24, 2023
6939bcd
Merge branch 'master' of github.com:binary-com/deriv-app into aum/WAL…
aum-deriv Oct 24, 2023
3853da6
Merge branch 'master' of github.com:binary-com/deriv-app into aum/WAL…
aum-deriv Oct 24, 2023
a2c6c1e
Merge branch 'master' of github.com:binary-com/deriv-app into aum/WAL…
aum-deriv Oct 24, 2023
e5c4d0b
Merge branch 'master' of github.com:binary-com/deriv-app into aum/WAL…
aum-deriv Oct 25, 2023
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
3 changes: 3 additions & 0 deletions packages/wallets/src/features/cashier/modules/DepositCrypto/DepositCrypto.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
.wallets-deposit-crypto {
display: flex;
flex-direction: column;
padding-top: 2.4rem;
justify-content: center;
gap: 2.4rem;
position: relative;

@include mobile {
width: 100%;
justify-content: start;
padding-top: 0rem;
gap: 1.6rem;
}
}
2 changes: 1 addition & 1 deletion ...es/cashier/modules/DepositCrypto/components/DepositCryptoAddress/DepositCryptoAddress.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const DepositCryptoAddress = () => {

return (
<div className='wallets-deposit-crypto-address'>
<QRCode size={isMobile ? 128 : 160} value={depositCryptoAddress || ''} />
<QRCode size={128} value={depositCryptoAddress || ''} />
<div className='wallets-deposit-crypto-address__hash-container'>
<p className='wallets-deposit-crypto-address__hash'>{depositCryptoAddress}</p>
<WalletClipboard
Expand Down
9 changes: 0 additions & 9 deletions ...s/DepositCrypto/components/DepositCryptoCurrencyDetails/DepositCryptoCurrencyDetails.scss
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions ...es/DepositCrypto/components/DepositCryptoCurrencyDetails/DepositCryptoCurrencyDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import React from 'react';
import { useActiveWalletAccount } from '@deriv/api';
import './DepositCryptoCurrencyDetails.scss';
import { WalletText } from '../../../../../../components';

const DepositCryptoCurrencyDetails = () => {
const { data } = useActiveWalletAccount();

return (
<p className='wallets-deposit-crypto-currency-details'>
<WalletText align='center' size='md' weight='bold'>
Send only {data?.currency_config?.name} ({data?.currency_config?.display_code}) to this address.
</p>
</WalletText>
);
};

Expand Down
9 changes: 7 additions & 2 deletions ...r/modules/DepositCrypto/components/DepositCryptoDisclaimers/DepositCryptoDisclaimers.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,19 @@
justify-content: center;
gap: 2.4rem;

@include mobile {
gap: 1.6rem;
}

&__content {
line-height: 1.4rem;
}

&__note {
display: flex;
justify-content: center;
font-size: 1.2rem;
line-height: 1.8rem;
text-align: center;
display: flex;
justify-content: center;
}
}
4 changes: 3 additions & 1 deletion ...er/modules/DepositCrypto/components/DepositCryptoDisclaimers/DepositCryptoDisclaimers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@ const DepositCryptoDisclaimers = () => {
<div className='wallets-deposit-crypto-disclaimers'>
<InlineMessage>
<div className='wallets-deposit-crypto-disclaimers__content'>
<p>To avoid loss of funds:</p>
<WalletText size='2xs' weight='bold'>
To avoid loss of funds:
</WalletText>
<br />
{data?.currency_config?.minimum_deposit && (
<li>
Expand Down