-
Notifications
You must be signed in to change notification settings - Fork 298
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Nada/89550/remove validation ad amount (#7753)
* fix: removed error validation for amount greater than user's balance * fix: added popup for creating ad greater than balance * fix: pr comments fixed * fix: reuse common modal for visibility errors
- Loading branch information
1 parent
a800746
commit be43adf
Showing
10 changed files
with
162 additions
and
59 deletions.
There are no files selected for viewing
32 changes: 32 additions & 0 deletions
32
...p2p/src/components/modal-manager/modals/ad-error-tooltip-modal/ad-error-tooltip-modal.jsx
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,32 @@ | ||
import React from 'react'; | ||
import { Button, Modal, Text } from '@deriv/components'; | ||
import { observer } from 'mobx-react-lite'; | ||
import { localize, Localize } from 'Components/i18next'; | ||
import { useStores } from 'Stores'; | ||
import { useModalManagerContext } from 'Components/modal-manager/modal-manager-context'; | ||
|
||
const AdErrorTooltipModal = () => { | ||
const { my_ads_store, general_store } = useStores(); | ||
const { hideModal, is_modal_open } = useModalManagerContext(); | ||
|
||
return ( | ||
<Modal className='p2p-my-ads__modal-error' is_open={is_modal_open} small has_close_icon={false}> | ||
<Modal.Body> | ||
<Text as='p' color='prominent' size='xs'> | ||
<Localize | ||
i18n_default_text='Your ad is not listed on Buy/Sell because its minimum order is higher than your Deriv P2P available balance ({{balance}} {{currency}}).' | ||
values={{ | ||
balance: general_store.advertiser_info.balance_available, | ||
currency: my_ads_store.advert_details?.account_currency, | ||
}} | ||
/> | ||
</Text> | ||
</Modal.Body> | ||
<Modal.Footer> | ||
<Button has_effect text={localize('Ok')} onClick={() => hideModal()} primary large /> | ||
</Modal.Footer> | ||
</Modal> | ||
); | ||
}; | ||
|
||
export default observer(AdErrorTooltipModal); |
3 changes: 3 additions & 0 deletions
3
packages/p2p/src/components/modal-manager/modals/ad-error-tooltip-modal/index.js
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,3 @@ | ||
import AdErrorTooltipModal from './ad-error-tooltip-modal'; | ||
|
||
export default AdErrorTooltipModal; |
48 changes: 0 additions & 48 deletions
48
...onents/modal-manager/modals/ad-exceeds-daily-limit-modal/ad-exceeds-daily-limit-modal.jsx
This file was deleted.
Oops, something went wrong.
3 changes: 0 additions & 3 deletions
3
packages/p2p/src/components/modal-manager/modals/ad-exceeds-daily-limit-modal/index.js
This file was deleted.
Oops, something went wrong.
91 changes: 91 additions & 0 deletions
91
...c/components/modal-manager/modals/ad-visibility-error-modal/ad-visibility-error-modal.jsx
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,91 @@ | ||
import React from 'react'; | ||
import { Button, Modal, Text } from '@deriv/components'; | ||
import { observer } from 'mobx-react-lite'; | ||
import { localize, Localize } from 'Components/i18next'; | ||
import { useStores } from 'Stores'; | ||
import { useModalManagerContext } from 'Components/modal-manager/modal-manager-context'; | ||
import { api_error_codes } from '../../../../constants/api-error-codes'; | ||
|
||
const AdVisibilityErrorModal = ({ error_code }) => { | ||
const { my_ads_store } = useStores(); | ||
const { hideModal, is_modal_open } = useModalManagerContext(); | ||
|
||
if (error_code === api_error_codes.AD_EXCEEDS_BALANCE) { | ||
return ( | ||
<Modal | ||
className='p2p-my-ads__modal-error' | ||
is_open={is_modal_open} | ||
small | ||
has_close_icon={false} | ||
title={localize("Your ad isn't visible to others")} | ||
> | ||
<Modal.Body> | ||
<Text as='p' color='prominent' size='xs'> | ||
<Localize | ||
i18n_default_text='This could be because your account balance is insufficient, your ad amount exceeds your daily limit, or both. You can still see your ad on <0>My ads</0>.' | ||
components={[<Text key={0} size='xs' weight='bold' />]} | ||
/> | ||
</Text> | ||
</Modal.Body> | ||
<Modal.Footer> | ||
<Button has_effect text={localize('Ok')} onClick={() => hideModal()} primary large /> | ||
</Modal.Footer> | ||
</Modal> | ||
); | ||
} else if (error_code === api_error_codes.AD_EXCEEDS_DAILY_LIMIT) { | ||
return ( | ||
<Modal | ||
className='p2p-my-ads__modal-error' | ||
is_open={is_modal_open} | ||
small | ||
has_close_icon={false} | ||
title={localize('Your ad exceeds the daily limit')} | ||
> | ||
<Modal.Body> | ||
<Text as='p' color='prominent' size='xs'> | ||
<Localize | ||
i18n_default_text='Your ad is not listed on <0>Buy/Sell</0> because the amount exceeds your daily limit of {{limit}} {{currency}}. | ||
<1 /><1 />You can still see your ad on <0>My ads</0>. If you’d like to increase your daily limit, please contact us via <2>live chat</2>.' | ||
values={{ | ||
limit: my_ads_store.advert_details?.max_order_amount_limit_display, | ||
currency: my_ads_store.advert_details?.account_currency, | ||
}} | ||
components={[ | ||
<Text key={0} size='xs' weight='bold' />, | ||
<br key={1} />, | ||
<span | ||
key={2} | ||
className='link link--orange' | ||
onClick={() => window.LC_API.open_chat_window()} | ||
/>, | ||
]} | ||
/> | ||
</Text> | ||
</Modal.Body> | ||
<Modal.Footer> | ||
<Button has_effect text={localize('Ok')} onClick={() => hideModal()} primary large /> | ||
</Modal.Footer> | ||
</Modal> | ||
); | ||
} | ||
return ( | ||
<Modal | ||
className='p2p-my-ads__modal-error' | ||
is_open={is_modal_open} | ||
small | ||
has_close_icon={false} | ||
title={localize("Something's not right")} | ||
> | ||
<Modal.Body> | ||
<Text as='p' color='prominent' size='xs'> | ||
<Localize i18n_default_text="Something's not right" /> | ||
</Text> | ||
</Modal.Body> | ||
<Modal.Footer> | ||
<Button has_effect text={localize('Ok')} onClick={() => hideModal()} primary large /> | ||
</Modal.Footer> | ||
</Modal> | ||
); | ||
}; | ||
|
||
export default observer(AdVisibilityErrorModal); |
3 changes: 3 additions & 0 deletions
3
packages/p2p/src/components/modal-manager/modals/ad-visibility-error-modal/index.js
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,3 @@ | ||
import AdVisibilityErrorModal from './ad-visibility-error-modal'; | ||
|
||
export default AdVisibilityErrorModal; |
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
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
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
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