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.

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

carol/ P2P: Remove confirm modal #6430

Merged
merged 26 commits into from
Sep 20, 2022
Merged
Changes from 24 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
1eba58b
Merge branch 'master' of github.com:binary-com/deriv-app
Apr 14, 2022
086058c
Merge branch 'master' of github.com:binary-com/deriv-app
Apr 20, 2022
ba5e87e
Merge branch 'master' of github.com:binary-com/deriv-app
Apr 22, 2022
95b8ec8
Merge branch 'master' of github.com:binary-com/deriv-app
May 27, 2022
a12090f
Merge branch 'master' of github.com:binary-com/deriv-app
Jun 8, 2022
d7d17cc
Merge branch 'master' of github.com:binary-com/deriv-app
Jun 9, 2022
be7c7bb
Merge branch 'master' of github.com:binary-com/deriv-app
Jun 10, 2022
f60d6c2
Merge branch 'master' of github.com:binary-com/deriv-app
Jun 16, 2022
f28f08d
Merge branch 'master' of github.com:binary-com/deriv-app
Jun 21, 2022
da2aaf6
Merge branch 'master' of github.com:binary-com/deriv-app
Jun 22, 2022
6d9113c
Merge branch 'master' of github.com:binary-com/deriv-app
Jun 27, 2022
4244c91
Merge branch 'master' of github.com:binary-com/deriv-app
Jul 4, 2022
b3f8906
Merge branch 'master' of github.com:binary-com/deriv-app
Jul 7, 2022
6f3aea9
Merge branch 'master' of github.com:binary-com/deriv-app
Jul 12, 2022
cb70bf6
Merge branch 'master' of github.com:binary-com/deriv-app
Aug 1, 2022
b39bc60
Merge branch 'master' of github.com:binary-com/deriv-app
Aug 11, 2022
7947c41
pull master
Aug 11, 2022
a1e3e4c
Merge branch 'master' of github.com:binary-com/deriv-app
Aug 23, 2022
3287844
Merge branch 'master' of github.com:binary-com/deriv-app
Aug 25, 2022
de0c346
Merge branch 'master' of github.com:binary-com/deriv-app
Sep 1, 2022
f72c312
Merge branch 'master' of github.com:binary-com/deriv-app
Sep 2, 2022
78abcbf
Merge branch 'master' of github.com:binary-com/deriv-app
Sep 8, 2022
57aea98
Merge branch 'master' of github.com:binary-com/deriv-app
Sep 9, 2022
9067c7d
remove extra modal from 2FA flow
Sep 9, 2022
e6f073a
hide reasons
Sep 12, 2022
e25c621
Merge branch 'master' into remove-confirm-modal
carolsachdeva Sep 20, 2022
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
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import OrderDetailsConfirmModal from './order-details-confirm-modal.jsx';
const OrderDetailsFooter = observer(() => {
const { order_store } = useStores();
const {
// id,
id,
is_buy_order_for_user,
should_show_cancel_and_paid_button,
should_show_complain_and_received_button,
Expand Down Expand Up @@ -42,15 +42,13 @@ const OrderDetailsFooter = observer(() => {
const showComplainOrderModal = () => setShouldShowComplainModal(true);

const hideConfirmOrderModal = () => setShouldShowConfirmModal(false);
const showConfirmOrderModal = () => setShouldShowConfirmModal(true);
// TODO: Uncomment this when we're ready to remove the modal
// const showConfirmOrderModal = () => {
// if (is_buy_order_for_user) {
// setShouldShowConfirmModal(true);
// } else {
// order_store.confirmOrderRequest(id);
// }
// };
const showConfirmOrderModal = () => {
if (is_buy_order_for_user) {
setShouldShowConfirmModal(true);
} else {
order_store.confirmOrderRequest(id);
}
};

if (should_show_cancel_and_paid_button) {
return (
Expand Down