Skip to content

Commit ec9569f

Browse files
authored
Merge pull request #188 from ameerul-deriv/FEQ-2448-refactor-AvailableP2PBalanceModal
Ameerul / FEQ-2448 Refactor AvailableP2PBalanceModal
2 parents ba4a4fc + 4482ab0 commit ec9569f

File tree

2 files changed

+28
-37
lines changed

2 files changed

+28
-37
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
.available-balance-modal {
2-
position: absolute;
3-
top: 50%;
4-
left: 50%;
5-
right: auto;
6-
bottom: auto;
7-
transform: translate(-50%, -50%);
8-
width: 44rem;
2+
@include default-modal;
93
padding: 2.4rem;
10-
border-radius: 8px;
11-
background: #fff;
12-
box-shadow: 0px 32px 64px 0px rgba(14, 14, 14, 0.14);
4+
5+
@include mobile {
6+
padding: 1.6rem;
7+
}
138

149
&__text {
1510
margin: 2.4rem 0 1.6rem;
@@ -30,17 +25,10 @@
3025

3126
&__note {
3227
font-style: italic;
33-
margin: 1.6rem 0 2.4rem;
28+
margin: 1.6rem 0;
3429
}
3530

3631
@include mobile {
37-
padding: 1.6rem;
3832
width: 32.8rem;
3933
}
40-
41-
&__footer {
42-
display: flex;
43-
justify-content: flex-end;
44-
gap: 0.8rem;
45-
}
4634
}

src/components/Modals/AvailableP2PBalanceModal/AvailableP2PBalanceModal.tsx

+22-19
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
import Modal from 'react-modal';
21
import { Localize } from '@deriv-com/translations';
3-
import { Button, Text } from '@deriv-com/ui';
2+
import { Button, Modal, Text } from '@deriv-com/ui';
43
import { customStyles } from '../helpers';
54
import './AvailableP2PBalanceModal.scss';
65

@@ -20,28 +19,32 @@ const AvailableP2PBalanceModal = ({ isModalOpen, onRequestClose }: TAvailableP2P
2019
style={customStyles}
2120
testId='dt_available_p2p_balance_modal'
2221
>
23-
<Text as='p' weight='bold'>
24-
<Localize i18n_default_text='Deriv P2P balance' />
25-
</Text>
26-
<Text as='p' className='available-balance-modal__text' size='sm'>
27-
<Localize i18n_default_text='Your Deriv P2P balance includes:' />
28-
</Text>
29-
<ol className='available-balance-modal__list'>
30-
<Text as='li' size='sm'>
31-
<Localize i18n_default_text='P2P deposits: Funds received from buying USD from another Deriv P2P user.' />
22+
<Modal.Header className='p-0 h-auto' hideBorder hideCloseIcon>
23+
<Text as='p' weight='bold'>
24+
<Localize i18n_default_text='Deriv P2P balance' />
3225
</Text>
33-
<Text as='li' size='sm'>
34-
<Localize i18n_default_text='Non-reversible deposits: Deposits from non-reversible payment methods.' />
26+
</Modal.Header>
27+
<Modal.Body>
28+
<Text as='p' className='available-balance-modal__text' size='sm'>
29+
<Localize i18n_default_text='Your Deriv P2P balance includes:' />
3530
</Text>
36-
</ol>
37-
<Text as='p' className='available-balance-modal__note' size='sm'>
38-
<Localize i18n_default_text='Note: Funds deposited using reversible payment methods, like credit cards, Maestro, Diners Club, ZingPay, Skrill, Neteller, Ozow, and UPI QR will not appear in your P2P balance.' />
39-
</Text>
40-
<div className='available-balance-modal__footer'>
31+
<ol className='available-balance-modal__list'>
32+
<Text as='li' size='sm'>
33+
<Localize i18n_default_text='P2P deposits: Funds received from buying USD from another Deriv P2P user.' />
34+
</Text>
35+
<Text as='li' size='sm'>
36+
<Localize i18n_default_text='Non-reversible deposits: Deposits from non-reversible payment methods.' />
37+
</Text>
38+
</ol>
39+
<Text as='p' className='available-balance-modal__note' size='sm'>
40+
<Localize i18n_default_text='Note: Funds deposited using reversible payment methods, like credit cards, Maestro, Diners Club, ZingPay, Skrill, Neteller, Ozow, and UPI QR will not appear in your P2P balance.' />
41+
</Text>
42+
</Modal.Body>
43+
<Modal.Footer className='p-0 min-h-auto' hideBorder>
4144
<Button onClick={onRequestClose} size='lg' textSize='sm'>
4245
<Localize i18n_default_text='OK' />
4346
</Button>
44-
</div>
47+
</Modal.Footer>
4548
</Modal>
4649
);
4750
};

0 commit comments

Comments
 (0)