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

Adrienne / Market rate change popup not displayed #7478

Merged
merged 10 commits into from
Feb 14, 2023
Merged

Adrienne / Market rate change popup not displayed #7478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f0b127b
saved draft
adrienne-deriv Sep 21, 2022
c8459b8
fix: fixed merge conflicts
adrienne-deriv Dec 20, 2022
d89421e
fix: fixed merge conflicts
adrienne-deriv Dec 27, 2022
2f65c46
Merge branch 'p2p-modal-manager' of github.com:binary-com/deriv-app i…
adrienne-deriv Jan 3, 2023
b1cb704
Merge branch 'p2p-modal-manager' of github.com:binary-com/deriv-app i…
adrienne-deriv Jan 5, 2023
a3ad35f
Merge branch 'p2p-modal-manager' of github.com:binary-com/deriv-app i…
adrienne-deriv Jan 11, 2023
cbe49c9
Merge branch 'p2p-modal-manager' of github.com:binary-com/deriv-app i…
adrienne-deriv Jan 12, 2023
45b8b99
Merge branch 'p2p-modal-manager' of github.com:binary-com/deriv-app i…
adrienne-deriv Jan 31, 2023
0c7a56d
fix: fixed an issue where rate change modal is not shown when user ch…
adrienne-deriv Feb 1, 2023
d97189c
chore: removed old commits
adrienne-deriv Feb 1, 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/p2p/src/components/buy-sell/buy-sell-form.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ const BuySellForm = props => {
if (is_market_rate_changed && rate_type === ad_type.FLOAT) {
showModal({
key: 'RateChangeModal',
props: {
currency: buy_sell_store.local_currency,
},
});
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/p2p/src/components/modal-manager/modals/rate-change-modal/rate-change-modal.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import { useStores } from 'Stores';
import { useModalManagerContext } from 'Components/modal-manager/modal-manager-context';
import './rate-change-modal.scss';

const RateChangeModal = () => {
const RateChangeModal = ({ currency }) => {
const { floating_rate_store, general_store } = useStores();
const local_currency = general_store.client?.local_currency_config?.currency;
const local_currency = currency ?? general_store.client?.local_currency_config?.currency;
const { hideModal, is_modal_open } = useModalManagerContext();

const closeModal = () => {
Expand Down
3 changes: 3 additions & 0 deletions packages/p2p/src/stores/buy-sell-store.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,11 +414,14 @@ export default class BuySellStore extends BaseStore {
}

onLocalCurrencySelect(local_currency) {
const { floating_rate_store } = this.root_store;
this.setSelectedLocalCurrency(local_currency);
this.setLocalCurrency(local_currency);
this.setItems([]);
this.setIsLoading(true);
this.loadMoreItems({ startIndex: 0 });
floating_rate_store.previous_exchange_rate = null;
floating_rate_store.setIsMarketRateChanged(false);
}

registerIsListedReaction() {
Expand Down