frontend/pweb/lib/l10n/en.arb

@@ -421,7 +421,7 @@
   "paymentType": "Payment Method Type",
   "selectPaymentType": "Please select a payment method type",
 
-  "paymentTypeCard": "Credit Card",
+  "paymentTypeCard": "Russian bank card",
   "paymentTypeBankAccount": "Russian Bank Account",
   "paymentTypeIban": "IBAN",
   "paymentTypeWallet": "Wallet",

frontend/pweb/lib/l10n/ru.arb

@@ -421,7 +421,7 @@
   "paymentType": "Тип способа оплаты",
   "selectPaymentType": "Пожалуйста, выберите тип способа оплаты",
 
-  "paymentTypeCard": "Кредитная карта",
+  "paymentTypeCard": "Российская банковская карта",
   "paymentTypeBankAccount": "Российский банковский счет",
   "paymentTypeIban": "IBAN",
   "paymentTypeWallet": "Кошелек",

frontend/pweb/lib/pages/login/form.dart

@@ -109,7 +109,7 @@ class _LoginFormState extends State<LoginForm> {
             builder: (context, isUsernameValid, child) => ValueListenableBuilder<bool>(
               valueListenable: _isPasswordAcceptable,
               builder: (context, isPasswordValid, child) => ButtonsRow(
-                onSignUp: () => navigate(context, Pages.signup),
+                onSignUp: () => navigateAndReplace(context, Pages.signup),
                 login: () => _login(
                   context, 
                   () => navigateAndReplace(context, Pages.dashboard),

frontend/pweb/lib/pages/signup/form/content.dart

@@ -34,7 +34,7 @@ class SignUpFormContent extends StatelessWidget {
               Row(
                 children: [
                   IconButton(
-                    onPressed: Navigator.of(context).pop,
+                    onPressed: onLogin,
                     icon: Icon(Icons.arrow_back),
                   ),
                 ],

frontend/pweb/lib/pages/signup/form/state.dart

@@ -105,7 +105,7 @@ class SignUpFormState extends State<SignUpForm> {
         ),
       );
 
-  void handleLogin() => navigate(context, Pages.login);
+  void handleLogin() => navigateAndReplace(context, Pages.login);
 
   @override
   void dispose() {