From fcba3619f0947cdca8024c98ae0bdd774e0e5768 Mon Sep 17 00:00:00 2001
From: Eduard Kuzmenko <thanwords24@gmail.com>
Date: Mon, 18 Jul 2022 17:04:08 +0200
Subject: [PATCH] F

---
 src/components/popups/payment.ts     | 2 --
 src/components/popups/paymentCard.ts | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/popups/payment.ts b/src/components/popups/payment.ts
index ac0aa563..ac967505 100644
--- a/src/components/popups/payment.ts
+++ b/src/components/popups/payment.ts
@@ -752,8 +752,6 @@ export default class PopupPayment extends PopupElement {
               onConfirmed();
             });
           }
-
-          this.hide();
         } catch(err) {
           if((err as ApiError).type === 'BOT_PRECHECKOUT_TIMEOUT') {
             toastNew({langPackKey: 'Error.AnError'});
diff --git a/src/components/popups/paymentCard.ts b/src/components/popups/paymentCard.ts
index 3ba557ce..9d14fe5c 100644
--- a/src/components/popups/paymentCard.ts
+++ b/src/components/popups/paymentCard.ts
@@ -355,7 +355,7 @@ export default class PopupPaymentCard extends PopupElement<{
           const previousInputField = switchFocusOrder[switchFocusOrder.indexOf(inputField) - 1];
           if(previousInputField) {
             // previousInputField.value = previousInputField.value.slice(0, -1);
-            placeCaretAtEnd(previousInputField.input);
+            placeCaretAtEnd(previousInputField.input, true);
           }
         }
       };
@@ -375,7 +375,7 @@ export default class PopupPaymentCard extends PopupElement<{
                 !nextInputField.validateNew(undefined, undefined, true) : 
                 !nextInputField.value
               ) {
-                placeCaretAtEnd(nextInputField.input);
+                placeCaretAtEnd(nextInputField.input, true);
                 break;
               }
             }