diff --git a/packages/p2p/src/components/email-verification-modal/email-verification-modal.jsx b/packages/p2p/src/components/email-verification-modal/email-verification-modal.jsx
index b17d9a663e86..434b8eae602d 100644
--- a/packages/p2p/src/components/email-verification-modal/email-verification-modal.jsx
+++ b/packages/p2p/src/components/email-verification-modal/email-verification-modal.jsx
@@ -83,7 +83,14 @@ const EmailVerificationModal = ({
             </Modal.Body>
             {should_show_resend_email_button && should_show_reasons_if_no_email && (
                 <Modal.Footer className='email-verification-modal--footer'>
-                    <Button large primary onClick={onClickResendEmailButton}>
+                    <Button
+                        large
+                        primary
+                        onClick={() => {
+                            onClickResendEmailButton();
+                            setShouldShowReasonsIfNoEmail(false);
+                        }}
+                    >
                         <Localize i18n_default_text='Resend email' />
                         {/* TODO: Uncomment when time is available in BE response
                         <Localize i18n_default_text='Resend email {{remaining_time}}' values={{ remaining_time }} /> */}
diff --git a/packages/p2p/src/components/order-details/order-details-footer.jsx b/packages/p2p/src/components/order-details/order-details-footer.jsx
index 7885ba6090aa..4b5f804647a5 100644
--- a/packages/p2p/src/components/order-details/order-details-footer.jsx
+++ b/packages/p2p/src/components/order-details/order-details-footer.jsx
@@ -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,
@@ -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 (