@tap-payments/auth-jsconnect 2.10.2-development → 2.10.4-development

package/build/assets/locales/ar.json

@@ -135,15 +135,15 @@
     "call_center_placeholder": "رقم هاتف خدمة الإتصال",
     "cancel": "إلغاء",
     "capital_paid_hint": "00000",
-    "capital_paid_label": "رأس المال المدفوع ({{currency}})",
     "capital_paid_input_label": "رأس المال المدفوع",
+    "capital_paid_label": "رأس المال المدفوع ({{currency}})",
     "capital_paid_required": "Please Enter paid amount",
     "capital_share_count_hint": "00000",
     "capital_share_count_label": "عدد اسهم رأس المال",
     "capital_share_count_required": "Please Enter share count",
     "capital_share_value_hint": "00000",
-    "capital_share_value_label": "قيمة السهم ({{currency}})",
     "capital_share_value_input_label": "قيمة السهم",
+    "capital_share_value_label": "قيمة السهم ({{currency}})",
     "capital_share_value_required": "Please Enter share value",
     "category": "الفئة",
     "category_name": "اسم الفئة",
@@ -209,6 +209,7 @@
     "create_new_entity": "Create Entity",
     "creating_account_description": "هذه العملية تحتاج وقت...",
     "creating_account_title": "جارى انشاء الحساب",
+    "current_mobile_number": "رقم الجوال الحالي",
     "customer_base_name_hint": "اختر محليًا إذا كنت تبيع فقط في البلد الذي تقيم فيه. اختر إقليميًا إذا كنت تبيع أيضًا لدول مجلس التعاون الخليجي الأخرى. اختر عالمياً إذا كنت تبيع إلى أي دولة خارج دول مجلس التعاون الخليجي.",
     "data_loading_desc": "الرجاء الانتظار أثناء تحضير البيانات",
     "data_loading_title": "تحضير البيانات",
@@ -281,8 +282,8 @@
     "entity_type": "نوع الكيان",
     "entity_type_required": "Please select at least one entity type",
     "expected_customers_to_serve": "عدد العملاء شهريا",
-    "expected_sales_monthly": "البيع المتوقع في الشهر؟ ({{currency}})",
     "expected_sale_per_month": "البيع المتوقع في الشهر؟",
+    "expected_sales_monthly": "البيع المتوقع في الشهر؟ ({{currency}})",
     "expected_sales_yearly": "ما هي المبيعات المتوقعة لعملك شهريًا؟",
     "expected_served_monthly": "عدد العملاء شهريا",
     "expiry_date": "تاريخ الإنتهاء",
@@ -378,7 +379,6 @@
     "kyc_terms_title": "وثائق قانونية",
     "kyc_token_invalid": "الرجاء مراجعة رابط المرسل اليك",
     "kyc_users_description": "يرجى اختيار رقم هوية الممثل المعتمد للموافقة عليه مع {{provider}}",
-    "kyc_privacy_policy": "سياسة الخصوصية",
     "language": "English",
     "license_info": "معلومات الترخيص",
     "license_name_hint": "Enter legal name",
@@ -403,11 +403,14 @@
     "mobile_app_label": "تطبيقات هاتف",
     "mobile_button_label": "المتابعة عن طريق رقم الجوال",
     "mobile_number_description": "ابدأ فورًا باستخدام رقم هاتفك المحمول",
+    "mobile_ownership_title": "يرجى تحديث رقم هاتفك المحمول المسجل ليتوافق مع هويتك.",
     "month": "الشهر",
+    "monthly_income": "ما هو دخلك الشهري؟ ",
     "nafath_button_label": "المتابعة عن طريق نفاذ",
     "nafath_verification_description_check": "يرجى الدخول إلى تطبيق نفاذ الخاص بك وإدخال رقم الطلب أعلاه للمصادقة.",
     "nafath_verification_description_error": "حاول مرة اخرى",
     "nafath_verification_description_wait": "يرجى الدخول إلى تطبيق نفاذ الخاص بك وإدخال رقم الطلب أعلاه للمصادقة.",
+    "nafath_verification_failed": "تأكد من الموافقة على الطلب المرسل عبر تطبيق نفاذ، يرجى محاولة إرسال طلب جديد.",
     "nafath_verification_redirection_message": "سيتم إعادة توجيهك الآن",
     "nafath_verification_title_check": "المصادقة مع تطبيق نفاذ",
     "nafath_verification_title_error": "لا يمكننا تأكيد المصادقة الخاصة بك",
@@ -417,6 +420,7 @@
     "national_id_placeholder": "0000000000",
     "national_id_title": "الهوية الوطنية",
     "nationality_label": "الجنسية",
+    "new_mobile_number": "رقم الجوال الجديد",
     "next": "التالي",
     "no": "لا",
     "no_results": "لا نتائج",
@@ -486,7 +490,6 @@
     "please_choose_is_authorized": "الرجاء التأكيد إذا كنت أنت المستخدم المصرح له",
     "please_choose_relative_pep": "هل أنت أو أحد أقاربك شخص مكشوف علنًا (PEP)",
     "please_enter_actual_income": "ما هو دخلك الشهري ({{currency}}) ؟ ",
-    "monthly_income": "ما هو دخلك الشهري؟ ",
     "please_enter_employer_name": "يرجى إدخال اسم منشأه العمل الخاص بك",
     "please_try_again_after_few_minutes": "يمكنك محاولة تسجيل الدخول مرة أخرى بعد {{minutes}} دقيقة",
     "powered_by": "بواسطة",
@@ -526,8 +529,8 @@
     "share_count_hint": "0",
     "share_count_label": "عدد الأسهم",
     "share_value_hint": "0000",
-    "share_value_label": "قيمة السهم ({{currency}})",
     "share_value_input_label": "قيمة السهم",
+    "share_value_label": "قيمة السهم ({{currency}})",
     "sign_up": "Sign up",
     "signed_up": "تسجيل الدخول",
     "signin_email_label": "البريد الألكتروني",
@@ -600,6 +603,34 @@
     "tax_success_header_title": "اكتملت الضريبة",
     "tax_success_title": "تم تحديث المعلومات الضريبية الخاصة بعملك التجاري.",
     "team_size_title": "حجم الفريق",
+    "terminal_device_id": "رقم تعريف جهاز الكاشير",
+    "terminal_devices": "{{name}} أجهزة",
+    "terminal_flow_pending": "أجهزة نقاط الدفع",
+    "terminal_go_to_board": "الانتقال إلى اللوحة",
+    "terminal_id": "رقم تعريف جهاز نقطة الدفع",
+    "terminal_link": "ربط",
+    "terminal_link_terminal": "ربط جهاز نقطة الدفع",
+    "terminal_linked": "تمَّ الربط",
+    "terminal_linked_success": "تم ربط جهاز نقطة الدفع {{device}} الخاص بك بنجاح!",
+    "terminal_linked_with": "مرتبط مع",
+    "terminal_manage_terminals": "إدارة أجهزة نقاط الدفع",
+    "terminal_new_request_will_send": "لتأكيد الربط تمَّ إرسال طلب ربط جديد إلى تطبيق الـ Terminal من تاب.",
+    "terminal_no_terminal_linked": "لا يوجد أجهزة نقاط دفع مرتبطة",
+    "terminal_no_terminal_linked_description": "سيتم عرض أجهزة نقاط الدفع المرتبطة هنا عند توفّرها",
+    "terminal_or_use_code": "أو استخدم الرمز",
+    "terminal_paired_with": "مقترن بـ",
+    "terminal_push_notification_link_new_terminal_failed": "حدث خطأ. يرجى المحاولة لاحقاً",
+    "terminal_qr_code_description": "افتح تطبيق تاب على جهاز نقطة الدفع، ثم اختر جهاز نقطة الدفع المرتبط من قائمة المزيد.",
+    "terminal_request_denied": "تمَّ رفض طلب ربط جهاز نقطة الدفع {{device }}",
+    "terminal_request_will_send": "لتأكيد الربط سيتم إرسال طلب إلى تطبيق الـ Terminal من تاب.",
+    "terminal_resend_request": "إعادة إرسال الطلب",
+    "terminal_select_device": "اختر جهاز نقطة الدفع",
+    "terminal_send_link_request": "إرسال طلب الربط",
+    "terminal_serial_number": "الرقم التسلسلي",
+    "terminal_unlink": "إلغاء الربط",
+    "terminal_unlinked": "غير مرتبط",
+    "terminal_unlinked_success": "تم إلغاء ربط جهاز نقطة الدفع {{device}} الخاص بك بنجاح!",
+    "terminal_with": "مع",
     "terms_and_conditions_link_title": "الشروط والاحكام",
     "the nin format is not valid": "هل يمكنك التحقق من رقم الهوية الذي تم إدخاله.",
     "title_article": "مذكرة التأسيس",
@@ -620,6 +651,8 @@
     "unified_number_hint": "000000",
     "unified_number_label": "الرقم الموحد",
     "unified_number_required": "Unified Number Required",
+    "update_later": "سأقوم بالتحديث لاحقاً",
+    "update_mobile_number": "تحديث رقم الجوال",
     "uploaded_file": "file",
     "vat_id": "رقم الضريبي المميز",
     "vat_id_placeholder": "00000000",
@@ -639,11 +672,6 @@
     "yes": "نعم",
     "your_brand_details": "تفاصيل علامتك التجارية",
     "يرجى التحقق من اسم تطبيق ابل": "",
-    "mobile_ownership_title": "لتفعيل استلام الايداعات، يرجى تحديث رقم هاتفك المحمول المسجل ليتوافق مع هويتك.",
-    "current_mobile_number": "رقم الجوال الحالي",
-    "new_mobile_number": "رقم الجوال الجديد",
-    "update_mobile_number": "تحديث رقم الجوال",
-    "update_later": "سأقوم بالتحديث لاحقاً",
     "passcode_title": "الرجاء إدخال رمز المرور الخاص بك",
     "sign_in_with_otp": "تسجيل الدخول باستخدام رمز التحقق (OTP)",
     "passcode_required": "الرجاء إدخال رمز المرور المطلوب",

package/build/assets/locales/en.json

@@ -134,15 +134,15 @@
     "call_center_placeholder": "Enter your call center number",
     "cancel": "Cancel",
     "capital_paid_hint": "00000",
-    "capital_paid_label": "Capital Paid ({{currency}})",
     "capital_paid_input_label": "Capital Paid",
+    "capital_paid_label": "Capital Paid ({{currency}})",
     "capital_paid_required": "Please Enter paid amount",
     "capital_share_count_hint": "00000",
     "capital_share_count_label": "Capital Share Count",
     "capital_share_count_required": "Please Enter share count",
     "capital_share_value_hint": "00000",
-    "capital_share_value_label": "Capital Share Value ({{currency}})",
     "capital_share_value_input_label": "Capital Share Value",
+    "capital_share_value_label": "Capital Share Value ({{currency}})",
     "capital_share_value_required": "Please Enter share value",
     "category": "Category",
     "category_name": "Category name",
@@ -216,6 +216,7 @@
     "create_new_entity": "Create Entity",
     "creating_account_description": "This might take a moment...",
     "creating_account_title": "Creating your account",
+    "current_mobile_number": "Current mobile number",
     "customer_base_name_hint": "Choose local if you sell only in the country where you are based. Choose regional if you also sell to other GCC countries. Choose worldwide if you sell to any country outside the GCC.",
     "data_loading_desc": "Please wait as we are preparing data",
     "data_loading_title": "Preparing data",
@@ -258,7 +259,7 @@
     "enter_license_no": "Freelance registration",
     "enter_license_number": "Please enter license number at least 5 chars",
     "enter_national_id": "Identification number",
-    "enter_served_monthly": "Customers server per month",
+    "enter_served_monthly": "Customers served per month",
     "enter_strong_password": "Please enter strong password.",
     "enter_valid_birth_date": "Please enter a valid birth date.",
     "enter_valid_brand_name": "Please enter a valid brand name.",
@@ -288,11 +289,11 @@
     "entity_success_title": "Entity Updated Successfully",
     "entity_type": "Entity Type",
     "entity_type_required": "Please select at least one entity type",
-    "expected_customers_to_serve": "Customers server per month",
-    "expected_sales_monthly": "Expected sale per month? ({{currency}})",
+    "expected_customers_to_serve": "Customers served per month",
     "expected_sale_per_month": "Expected sale per month?",
+    "expected_sales_monthly": "Expected sale per month? ({{currency}})",
     "expected_sales_yearly": "What is the expected sales for your business per month?",
-    "expected_served_monthly": "Customers server per month",
+    "expected_served_monthly": "Customers served per month",
     "expiry_date": "Date of expiry",
     "express_account_already_created_close_button": "Close",
     "express_account_already_created_description": "Your Account is already created",
@@ -392,7 +393,6 @@
     "kyc_token_invalid": "May you please verify link of which you are trying to open.",
     "kyc_users_description": "Please select an authorized registered ID to approve with {{provider}}",
     "kyc_verification": "Know Your Customer (KYC)",
-    "kyc_privacy_policy": "Privacy Policy",
     "language": "العربية",
     "license_info": "License information",
     "license_name_hint": "Enter legal name",
@@ -418,11 +418,14 @@
     "mobile_app_label": "Mobile App",
     "mobile_button_label": "Continue with Mobile",
     "mobile_number_description": "Start instantly with your Mobile Number",
+    "mobile_ownership_title": "Please update your mobile number to match you national ID",
     "month": "Month",
+    "monthly_income": "Monthly income",
     "nafath_button_label": "Continue with Nafath",
     "nafath_verification_description_check": "Please go to your NAFATH app and enter the above request number to authenticate.",
     "nafath_verification_description_error": "Please try again",
     "nafath_verification_description_wait": "Please go to your NAFATH app and enter the above request number to authenticate.",
+    "nafath_verification_failed": "Make sure to approve the request sent through Nafath App, please try to send a new request.",
     "nafath_verification_redirection_message": "You will be redirected now",
     "nafath_verification_title_check": "Authenticate with NAFATH app",
     "nafath_verification_title_error": "We cannot confirm your authentication",
@@ -432,6 +435,7 @@
     "national_id_placeholder": "0000000000",
     "national_id_title": "National ID",
     "nationality_label": "Nationality",
+    "new_mobile_number": "New mobile number",
     "next": "Next",
     "no": "No",
     "no login credentials available": "May you please verify the entered email address. (Note - Please make sure to enter an email address associated with Tap)",
@@ -502,7 +506,6 @@
     "please_choose_is_authorized": "Please tell us if you are the authorized user",
     "please_choose_relative_pep": "Are you or one of your relatives a Publicly Exposed Person (PEP)",
     "please_enter_actual_income": "Monthly income ({{currency}})",
-    "monthly_income": "Monthly income",
     "please_enter_employer_name": "Please enter the name of your employer",
     "please_try_again_after_few_minutes": "You can try to login again after {{minutes}} mins",
     "powered_by": "Powered by",
@@ -548,8 +551,8 @@
     "share_count_hint": "0",
     "share_count_label": "Share Count",
     "share_value_hint": "0000",
-    "share_value_label": "Share Value ({{currency}})",
     "share_value_input_label": "Share Value",
+    "share_value_label": "Share Value ({{currency}})",
     "sign_up": "Sign up",
     "signed_up": "Signed up",
     "signin_email_label": "Email address",
@@ -625,6 +628,34 @@
     "tax_success_header_title": "Tax completed",
     "tax_success_title": "Your tax details are updated",
     "team_size_title": "Team Size",
+    "terminal_device_id": "Device ID",
+    "terminal_devices": "{{name}} Devices",
+    "terminal_flow_pending": "Terminals",
+    "terminal_go_to_board": "Go to Board",
+    "terminal_id": "Terminal ID",
+    "terminal_link": "Link",
+    "terminal_link_terminal": "Link Terminal",
+    "terminal_linked": "Linked",
+    "terminal_linked_success": "Your terminal {{device}} is linked successfully",
+    "terminal_linked_with": "Linked with",
+    "terminal_manage_terminals": "Manage Terminals",
+    "terminal_new_request_will_send": "A new link request bas ben sent to Tap Terminal app to confirm linking.",
+    "terminal_no_terminal_linked": "No Terminal Linked",
+    "terminal_no_terminal_linked_description": "We will list the linked terminals here when available",
+    "terminal_or_use_code": "or use code",
+    "terminal_paired_with": "Paired with",
+    "terminal_push_notification_link_new_terminal_failed": "Something went wrong. Please try again later",
+    "terminal_qr_code_description": "Open the Tap app on the terminal and select Linked Terminal from the More menu.",
+    "terminal_request_denied": "The Request to link Terminal {{device}} has been denied.",
+    "terminal_request_will_send": "A request will be sent to Tap Terminal app to confirm linking.",
+    "terminal_resend_request": "Resend Request",
+    "terminal_select_device": "Select device",
+    "terminal_send_link_request": "Send linking request",
+    "terminal_serial_number": "Serial no",
+    "terminal_unlink": "Unlink",
+    "terminal_unlinked": "Unlinked",
+    "terminal_unlinked_success": "Your terminal {{device}} is unlinked successfully",
+    "terminal_with": "with",
     "terms_and_conditions_link_title": "terms and conditions",
     "the nin format is not valid": "May you please verify the entered identification number.",
     "title_article": "Article of association",
@@ -646,6 +677,8 @@
     "unified_number_hint": "00000",
     "unified_number_label": "Unified Number",
     "unified_number_required": "Unified Number Required",
+    "update_later": "I'll update later",
+    "update_mobile_number": "Update mobile number",
     "upload_bank_statement": "Please upload the bank statement",
     "upload_file": "Select a file from your computer",
     "uploaded_file": "file",
@@ -666,38 +699,6 @@
     "year": "Year",
     "yes": "Yes",
     "your_brand_details": "Your brand details",
-    "mobile_ownership_title": "To enable bank payouts, please update your registered mobile number to match your national ID.",
-    "current_mobile_number": "Current mobile number",
-    "new_mobile_number": "New mobile number",
-    "update_mobile_number": "Update mobile number",
-    "update_later": "I'll update later",
-    "terminal_manage_terminals": "Manage Terminals",
-    "terminal_link_terminal": "Link Terminal",
-    "terminal_linked": "Linked",
-    "terminal_link": "Link",
-    "terminal_unlinked": "Unlinked",
-    "terminal_paired_with": "Paired with",
-    "terminal_device_id": "Device ID",
-    "terminal_serial_number": "Serial no",
-    "terminal_qr_code_description": "Open the Tap app on the terminal and select Linked Terminal from the More menu.",
-    "terminal_or_use_code": "or use code",
-    "terminal_unlink": "Unlink",
-    "terminal_linked_with": "Linked with",
-    "terminal_send_link_request": "Send linking request",
-    "terminal_request_will_send": "A request will be sent to Tap Terminal app to confirm linking.",
-    "terminal_new_request_will_send": "A new link request bas ben sent to Tap Terminal app to confirm linking.",
-    "terminal_resend_request": "Resend Request",
-    "terminal_with": "with",
-    "terminal_request_denied": "The Request to link Terminal {{device}} has been denied.",
-    "terminal_go_to_board": "Go to Board",
-    "terminal_linked_success": "Your terminal {{device}} is linked successfully",
-    "terminal_unlinked_success": "Your terminal {{device}} is unlinked successfully",
-    "terminal_no_terminal_linked": "No Terminal Linked",
-    "terminal_no_terminal_linked_description": "We will list the linked terminals here when available",
-    "terminal_push_notification_link_new_terminal_failed": "Something went wrong. Please try again later",
-    "terminal_id": "Terminal ID",
-    "terminal_devices": "{{name}} Devices",
-    "terminal_flow_pending": "Terminals",
     "passcode_title": "Please enter your passcode",
     "sign_in_with_otp": "Sign in with OTP",
     "passcode_required": "Please enter the required Passcode",

package/build/constants/app.js

@@ -975,13 +975,13 @@ export var BRAND_SCREENS_NAVIGATION = [
 export var TERMINAL_SCREENS_NAVIGATION = [
     {
         name: CONNECT_FLOWS.terminal.verify,
-        next: [CONNECT_FLOWS.terminal.terminalList, CONNECT_FLOWS.terminal.noTerminalLinked],
+        next: [CONNECT_FLOWS.terminal.terminalDeviceList, CONNECT_FLOWS.terminal.noTerminalLinked],
         prev: CONNECT_FLOWS.terminal.board,
         order: 1
     },
     {
         name: CONNECT_FLOWS.terminal.loadingData,
-        next: CONNECT_FLOWS.terminal.terminalList,
+        next: CONNECT_FLOWS.terminal.terminalDeviceList,
         prev: '',
         order: 1
     },
@@ -998,11 +998,17 @@ export var TERMINAL_SCREENS_NAVIGATION = [
         order: 2
     },
     {
-        name: CONNECT_FLOWS.terminal.terminalList,
-        next: [CONNECT_FLOWS.terminal.terminalLinkNew, CONNECT_FLOWS.terminal.linkedTerminalInfo, CONNECT_FLOWS.terminal.unlinkedTerminalInfo],
+        name: CONNECT_FLOWS.terminal.terminalDeviceList,
+        next: [CONNECT_FLOWS.terminal.terminalList, CONNECT_FLOWS.terminal.linkedTerminalInfo, CONNECT_FLOWS.terminal.unlinkedTerminalInfo],
         prev: CONNECT_FLOWS.terminal.board,
         order: 2
     },
+    {
+        name: CONNECT_FLOWS.terminal.terminalList,
+        next: CONNECT_FLOWS.terminal.terminalLinkNew,
+        prev: CONNECT_FLOWS.terminal.terminalDeviceList,
+        order: 3
+    },
     {
         name: CONNECT_FLOWS.terminal.terminalLinkNew,
         next: CONNECT_FLOWS.terminal.terminalLinkedSuccess,
@@ -1012,13 +1018,13 @@ export var TERMINAL_SCREENS_NAVIGATION = [
     {
         name: CONNECT_FLOWS.terminal.linkedTerminalInfo,
         next: CONNECT_FLOWS.terminal.terminalUnlinkedSuccess,
-        prev: CONNECT_FLOWS.terminal.terminalList,
+        prev: CONNECT_FLOWS.terminal.terminalDeviceList,
         order: 3
     },
     {
         name: CONNECT_FLOWS.terminal.unlinkedTerminalInfo,
         next: CONNECT_FLOWS.terminal.terminalLinkedSuccess,
-        prev: CONNECT_FLOWS.terminal.terminalList,
+        prev: CONNECT_FLOWS.terminal.terminalDeviceList,
         order: 3
     },
     {

package/build/constants/flows.d.ts

@@ -28,7 +28,7 @@ export declare const CONNECT_FLOWS: {
         operatorError: string;
         verify: string;
         noTerminalLinked: string;
-        terminalList: string;
+        terminalDeviceList: string;
         terminalLinkNew: string;
         linkedTerminalInfo: string;
         unlinkedTerminalInfo: string;
@@ -36,5 +36,6 @@ export declare const CONNECT_FLOWS: {
         terminalUnlinkedSuccess: string;
         board: string;
         resetPassword: string;
+        terminalList: string;
     };
 };

package/build/constants/flows.js

@@ -29,13 +29,14 @@ export var CONNECT_FLOWS = {
         operatorError: 'TERMINAL_OPERATOR_ERROR_STEP',
         verify: 'TERMINAL_VERIFY_OTP_STEP',
         noTerminalLinked: 'TERMINAL_NO_TERMINAL_LINKED',
-        terminalList: 'TERMINAL_LIST_STEP',
+        terminalDeviceList: 'TERMINAL_DEVICE_LIST_STEP',
         terminalLinkNew: 'TERMINAL_LINK_NEW_STEP',
         linkedTerminalInfo: 'TERMINAL_LINKED_INFO_STEP',
         unlinkedTerminalInfo: 'TERMINAL_UNLINKED_INFO_STEP',
         terminalLinkedSuccess: 'TERMINAL_LINKED_SUCCESS_STEP',
         terminalUnlinkedSuccess: 'TERMINAL_UNLINKED_SUCCESS_STEP',
         board: 'TERMINAL_BOARD_STEP',
-        resetPassword: 'TERMINAL_RESET_PASSWORD'
+        resetPassword: 'TERMINAL_RESET_PASSWORD',
+        terminalList: 'TERMINAL_LIST_STEP'
     }
 };

package/build/features/app/terminal/terminalStore.js

@@ -85,7 +85,7 @@ export var verifyToken = createAsyncThunk('terminal/verifyLeadToken', function (
                     return [4, API.terminalService.retrieveTerminalDeviceList([merchant_id])];
                 case 2:
                     terminalData = _d.sent();
-                    nextScreen = ((_c = terminalData === null || terminalData === void 0 ? void 0 : terminalData.terminal_devices) === null || _c === void 0 ? void 0 : _c.length) ? CONNECT_FLOWS.terminal.terminalList : CONNECT_FLOWS.terminal.noTerminalLinked;
+                    nextScreen = ((_c = terminalData === null || terminalData === void 0 ? void 0 : terminalData.terminal_devices) === null || _c === void 0 ? void 0 : _c.length) ? CONNECT_FLOWS.terminal.terminalDeviceList : CONNECT_FLOWS.terminal.noTerminalLinked;
                     return [2, {
                             data: data,
                             token: token,
@@ -141,7 +141,7 @@ export var verifyTokenOTP = createAsyncThunk('terminal/verifyOtp', function (par
                 return [4, API.terminalService.retrieveTerminalDeviceList([merchant_id])];
             case 2:
                 terminalData = _h.sent();
-                nextScreen = ((_e = terminalData === null || terminalData === void 0 ? void 0 : terminalData.terminal_devices) === null || _e === void 0 ? void 0 : _e.length) ? CONNECT_FLOWS.terminal.terminalList : CONNECT_FLOWS.terminal.noTerminalLinked;
+                nextScreen = ((_e = terminalData === null || terminalData === void 0 ? void 0 : terminalData.terminal_devices) === null || _e === void 0 ? void 0 : _e.length) ? CONNECT_FLOWS.terminal.terminalDeviceList : CONNECT_FLOWS.terminal.noTerminalLinked;
                 (_g = (_f = settings.data.appConfig).onStepCompleted) === null || _g === void 0 ? void 0 : _g.call(_f, settings.data.activeScreen.name, { otp: params.otp });
                 return [2, { data: data, terminalData: terminalData, formData: params, nextScreen: nextScreen }];
         }
@@ -513,14 +513,17 @@ export var terminalSlice = createSlice({
             state.error = action.error.message;
         })
             .addCase(linkNewTerminal.pending, function (state) {
+            state.loading = true;
             state.error = null;
         })
             .addCase(linkNewTerminal.fulfilled, function (state, action) {
+            state.loading = false;
             state.error = null;
             var data = action.payload.data;
             state.data.responseData = __assign(__assign({}, state.data.responseData), { linkNewTerminalData: data });
         })
             .addCase(linkNewTerminal.rejected, function (state, action) {
+            state.loading = false;
             state.error = action.error.message;
         })
             .addCase(retrieveTerminalList.fulfilled, function (state, action) {

package/build/features/featuresScreens.js

@@ -146,6 +146,7 @@ import TerminalOperatorErrorPage from './terminal/screens/OperatorError';
 import TerminalVerifyPage from './terminal/screens/Verify';
 import NoTerminalDeviceLinkedPage from './terminal/screens/NoTerminalDeviceLinked';
 import TerminalDeviceListPage from './terminal/screens/TerminalDeviceList';
+import TerminalListPage from './terminal/screens/TerminalListPage';
 import LinkNewTerminalPage from './terminal/screens/LinkNewTerminal';
 import LinkedTerminalInfoPage from './terminal/screens/LinkedTerminalInfo';
 import UnlinkedTerminalInfoPage from './terminal/screens/UnlinkedTerminalInfo';
@@ -735,13 +736,17 @@ export var terminalFeatureScreens = [
         element: NoTerminalDeviceLinkedPage
     },
     {
-        name: CONNECT_FLOWS.terminal.terminalList,
+        name: CONNECT_FLOWS.terminal.terminalDeviceList,
         element: TerminalDeviceListPage
     },
     {
         name: CONNECT_FLOWS.terminal.terminalLinkNew,
         element: LinkNewTerminalPage
     },
+    {
+        name: CONNECT_FLOWS.terminal.terminalList,
+        element: TerminalListPage
+    },
     {
         name: CONNECT_FLOWS.terminal.linkedTerminalInfo,
         element: LinkedTerminalInfoPage

package/build/features/terminal/screens/LinkNewTerminal/LinkNewTerminal.js

@@ -31,7 +31,7 @@ var LinkNewTerminal = function () {
     var _f = React.useState(false), success = _f[0], setSuccess = _f[1];
     var _g = React.useState(false), failed = _g[0], setFailed = _g[1];
     var terminalInfo = data.terminalInfo, responseData = data.responseData;
-    var _h = responseData || {}, terminalData = _h.terminalData, linkNewTerminalData = _h.linkNewTerminalData;
+    var _h = responseData || {}, terminalData = _h.terminalData, linkNewTerminalData = _h.linkNewTerminalData, terminalList = _h.terminalList;
     var terminal_devices = (terminalData || {}).terminal_devices;
     var qrCode = (_a = linkNewTerminalData === null || linkNewTerminalData === void 0 ? void 0 : linkNewTerminalData.authentication) === null || _a === void 0 ? void 0 : _a.qr;
     var code = (_b = linkNewTerminalData === null || linkNewTerminalData === void 0 ? void 0 : linkNewTerminalData.authentication) === null || _b === void 0 ? void 0 : _b.code;

package/build/features/terminal/screens/LinkedTerminalInfo/LinkedTerminalInfo.js

@@ -43,7 +43,7 @@ var LinkedTerminalInfo = function () {
             .catch(function () { });
     };
     var handleOnBack = function () {
-        dispatch(handlePrevScreenStep(CONNECT_FLOWS.terminal.terminalList));
+        dispatch(handlePrevScreenStep(CONNECT_FLOWS.terminal.terminalDeviceList));
     };
     return (_jsxs(ScreenContainer, __assign({ minHeight: 224, sx: { pl: 2.5, pr: 2.5 }, justifyContent: 'space-between' }, { children: [_jsxs(Container, { children: [_jsx(DeviceCard, { badge: true, image: image_url, name: display_name, deviceId: getId(selectedTerminalDevice), deviceIdLabel: getIdLabel(selectedTerminalDevice), pairedWith: getPairedWith(selectedTerminalDevice), isLinked: linked }), _jsx(LinkWithText, { children: t('terminal_linked_with') }), _jsx(DeviceCard, { sx: { minHeight: spacing(10), borderRadius: spacing(1), background: palette.components.deviceCard.deviceInfoBackground }, image: deviceImage || '', name: deviceName || '', deviceId: deviceId !== null && deviceId !== void 0 ? deviceId : '', isLinked: linked })] }), _jsx(Button, __assign({ sx: { ml: 0, mr: 0 }, loading: loading, onBackClicked: handleOnBack, onClick: handleOnNext, isAr: isAr }, { children: t('terminal_unlink') }))] })));
 };

package/build/features/terminal/screens/TerminalDeviceList/TerminalDeviceList.js

@@ -54,40 +54,39 @@ import { handleNextScreenStep, handlePrevScreenStep } from '../../../../app/sett
 import { useAppDispatch, useAppSelector } from '../../../../hooks';
 import Button from '../../../../components/Button';
 import Loader from '../../../../components/Loader';
-import { linkNewTerminal, retrieveBoardDetails, retrieveBoardStatus, retrieveTerminalList, storeSelectedTerminalDevice, terminalSelector } from '../../../app/terminal/terminalStore';
-import Header from './Header';
+import { retrieveBoardDetails, retrieveBoardStatus, retrieveTerminalList, storeSelectedTerminalDevice, terminalSelector } from '../../../app/terminal/terminalStore';
+import { Header, Container, TextTypography } from '../shared';
 import DeviceList from './DeviceList';
-import { Container, TextTypography } from '../shared';
 var TerminalDeviceList = function () {
     var t = useTranslation().t;
     var dispatch = useAppDispatch();
     var _a = useAppSelector(terminalSelector), data = _a.data, loading = _a.loading, terminalListLoading = _a.terminalListLoading;
-    var _b = data.responseData || {}, boardFlows = _b.boardFlows, authData = _b.authData, boardData = _b.boardData, terminalData = _b.terminalData, terminalList = _b.terminalList;
+    var _b = React.useState(false), newLinkClicked = _b[0], setNewLinkClicked = _b[1];
+    var _c = data.responseData || {}, boardFlows = _c.boardFlows, authData = _c.authData, boardData = _c.boardData, terminalData = _c.terminalData, terminalList = _c.terminalList;
     var terminal_devices = (terminalData || {}).terminal_devices;
-    var _c = React.useMemo(function () {
+    var _d = React.useMemo(function () {
         var linked = terminal_devices === null || terminal_devices === void 0 ? void 0 : terminal_devices.filter(function (d) { return d.linked; });
         var unLinked = terminal_devices === null || terminal_devices === void 0 ? void 0 : terminal_devices.filter(function (d) { return !d.linked; });
         return { linkedDevices: linked, unLinkedDevices: unLinked };
-    }, [terminal_devices]), linkedDevices = _c.linkedDevices, unLinkedDevices = _c.unLinkedDevices;
-    var handleOnClickNewTerminalLink = function () {
-        dispatch(linkNewTerminal())
-            .unwrap()
-            .then(function (_a) {
-            var nextScreen = _a.nextScreen;
-            dispatch(handleNextScreenStep(nextScreen));
-        })
-            .catch(function () { });
-    };
-    var handleOnClickLinkedTerminal = function (terminal) {
-        dispatch(storeSelectedTerminalDevice(terminal));
-        dispatch(handleNextScreenStep(CONNECT_FLOWS.terminal.linkedTerminalInfo));
-    };
-    var handleOnClickUnlinkedTerminal = function (terminal) { return __awaiter(void 0, void 0, void 0, function () {
+    }, [terminal_devices]), linkedDevices = _d.linkedDevices, unLinkedDevices = _d.unLinkedDevices;
+    var handleOnClickNewTerminalLink = function () { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    setNewLinkClicked(true);
+                    return [4, retrieveTerminalListAsync()];
+                case 1:
+                    _a.sent();
+                    dispatch(handleNextScreenStep(CONNECT_FLOWS.terminal.terminalList));
+                    return [2];
+            }
+        });
+    }); };
+    var retrieveTerminalListAsync = function () { return __awaiter(void 0, void 0, void 0, function () {
         var err_1;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    dispatch(storeSelectedTerminalDevice(terminal));
                     if (!!(terminalList === null || terminalList === void 0 ? void 0 : terminalList.length)) return [3, 4];
                     _a.label = 1;
                 case 1:
@@ -100,7 +99,23 @@ var TerminalDeviceList = function () {
                     err_1 = _a.sent();
                     console.log('Error while retrieving terminal list error', err_1);
                     return [3, 4];
-                case 4:
+                case 4: return [2];
+            }
+        });
+    }); };
+    var handleOnClickLinkedTerminal = function (terminal) {
+        dispatch(storeSelectedTerminalDevice(terminal));
+        dispatch(handleNextScreenStep(CONNECT_FLOWS.terminal.linkedTerminalInfo));
+    };
+    var handleOnClickUnlinkedTerminal = function (terminal) { return __awaiter(void 0, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    setNewLinkClicked(false);
+                    dispatch(storeSelectedTerminalDevice(terminal));
+                    return [4, retrieveTerminalListAsync()];
+                case 1:
+                    _a.sent();
                     dispatch(handleNextScreenStep(CONNECT_FLOWS.terminal.unlinkedTerminalInfo));
                     return [2];
             }
@@ -124,6 +139,6 @@ var TerminalDeviceList = function () {
         })
             .catch(function () { });
     };
-    return (_jsxs(ScreenContainer, __assign({ minHeight: 200, sx: { pl: 2.5, pr: 2.5 }, justifyContent: 'space-between' }, { children: [_jsxs(Container, { children: [_jsx(Header, { onLinkClick: handleOnClickNewTerminalLink }), _jsx(DeviceList, { devices: linkedDevices, onClick: handleOnClickLinkedTerminal }), !!(unLinkedDevices === null || unLinkedDevices === void 0 ? void 0 : unLinkedDevices.length) && _jsx(TextTypography, __assign({ sx: { pt: 1, pb: 1 } }, { children: t('terminal_unlinked') })), _jsx(DeviceList, { loading: terminalListLoading, devices: unLinkedDevices, onClick: handleOnClickUnlinkedTerminal })] }), _jsx(Button, __assign({ sx: { mb: 1.5, mt: 1.5 }, onClick: function () { return handleOnBack(); }, variant: 'text' }, { children: loading ? _jsx(Loader, { innerColor: 'black', outerColor: 'black', size: 15, toggleAnimation: !!loading }) : t('back') }))] })));
+    return (_jsxs(ScreenContainer, __assign({ minHeight: 200, sx: { pl: 2.5, pr: 2.5 }, justifyContent: 'space-between' }, { children: [_jsxs(Container, { children: [_jsx(Header, { onLinkClick: handleOnClickNewTerminalLink, loading: terminalListLoading && newLinkClicked }), _jsx(DeviceList, { devices: linkedDevices, onClick: handleOnClickLinkedTerminal }), !!(unLinkedDevices === null || unLinkedDevices === void 0 ? void 0 : unLinkedDevices.length) && _jsx(TextTypography, __assign({ sx: { pt: 1, pb: 1 } }, { children: t('terminal_unlinked') })), _jsx(DeviceList, { loading: terminalListLoading && !newLinkClicked, devices: unLinkedDevices, onClick: handleOnClickUnlinkedTerminal })] }), _jsx(Button, __assign({ sx: { mb: 1.5, mt: 1.5 }, onClick: function () { return handleOnBack(); }, variant: 'text' }, { children: loading ? _jsx(Loader, { innerColor: 'black', outerColor: 'black', size: 15, toggleAnimation: !!loading }) : t('back') }))] })));
 };
 export default React.memo(TerminalDeviceList);

package/build/features/terminal/screens/TerminalDeviceList/styles.d.ts

@@ -1,16 +1,4 @@
 /// <reference types="react" />
-export declare const Container: import("@emotion/styled").StyledComponent<import("@mui/system").BoxOwnProps<import("@mui/material/styles").Theme> & Omit<Omit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "ref"> & {
-    ref?: ((instance: HTMLDivElement | null) => void) | import("react").RefObject<HTMLDivElement> | null | undefined;
-}, keyof import("@mui/system").BoxOwnProps<import("@mui/material/styles").Theme>> & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme>, {}, {}>;
-export declare const LinkButton: import("@emotion/styled").StyledComponent<import("@mui/material/Button").ButtonOwnProps & Omit<import("@mui/material").ButtonBaseOwnProps, "classes"> & import("@mui/material/OverridableComponent").CommonProps & Omit<Omit<import("react").DetailedHTMLProps<import("react").ButtonHTMLAttributes<HTMLButtonElement>, HTMLButtonElement>, "ref"> & {
-    ref?: ((instance: HTMLButtonElement | null) => void) | import("react").RefObject<HTMLButtonElement> | null | undefined;
-}, "className" | "style" | "classes" | "color" | "children" | "sx" | "tabIndex" | "action" | "size" | "disabled" | "variant" | "centerRipple" | "disableRipple" | "disableTouchRipple" | "focusRipple" | "focusVisibleClassName" | "LinkComponent" | "onFocusVisible" | "TouchRippleProps" | "touchRippleRef" | "disableElevation" | "disableFocusRipple" | "endIcon" | "fullWidth" | "href" | "startIcon"> & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme>, {}, {}>;
-export declare const AddIconContainer: import("@emotion/styled").StyledComponent<import("@mui/system").BoxOwnProps<import("@mui/material/styles").Theme> & Omit<Omit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "ref"> & {
-    ref?: ((instance: HTMLDivElement | null) => void) | import("react").RefObject<HTMLDivElement> | null | undefined;
-}, keyof import("@mui/system").BoxOwnProps<import("@mui/material/styles").Theme>> & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme>, {}, {}>;
-export declare const LinkText: import("@emotion/styled").StyledComponent<import("@mui/material/Typography").TypographyOwnProps & import("@mui/material/OverridableComponent").CommonProps & Omit<Omit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLSpanElement>, HTMLSpanElement>, "ref"> & {
-    ref?: ((instance: HTMLSpanElement | null) => void) | import("react").RefObject<HTMLSpanElement> | null | undefined;
-}, "left" | "right" | "className" | "style" | "classes" | "border" | "borderTop" | "borderRight" | "borderBottom" | "borderLeft" | "borderColor" | "borderRadius" | "display" | "displayPrint" | "overflow" | "textOverflow" | "visibility" | "whiteSpace" | "flexBasis" | "flexDirection" | "flexWrap" | "justifyContent" | "alignItems" | "alignContent" | "order" | "flex" | "flexGrow" | "flexShrink" | "alignSelf" | "justifyItems" | "justifySelf" | "gap" | "columnGap" | "rowGap" | "gridColumn" | "gridRow" | "gridAutoFlow" | "gridAutoColumns" | "gridAutoRows" | "gridTemplateColumns" | "gridTemplateRows" | "gridTemplateAreas" | "gridArea" | "bgcolor" | "color" | "zIndex" | "position" | "top" | "bottom" | "boxShadow" | "width" | "maxWidth" | "minWidth" | "height" | "maxHeight" | "minHeight" | "boxSizing" | "m" | "mt" | "mr" | "mb" | "ml" | "mx" | "my" | "p" | "pt" | "pr" | "pb" | "pl" | "px" | "py" | "margin" | "marginTop" | "marginRight" | "marginBottom" | "marginLeft" | "marginX" | "marginY" | "marginInline" | "marginInlineStart" | "marginInlineEnd" | "marginBlock" | "marginBlockStart" | "marginBlockEnd" | "padding" | "paddingTop" | "paddingRight" | "paddingBottom" | "paddingLeft" | "paddingX" | "paddingY" | "paddingInline" | "paddingInlineStart" | "paddingInlineEnd" | "paddingBlock" | "paddingBlockStart" | "paddingBlockEnd" | "typography" | "fontFamily" | "fontSize" | "fontStyle" | "fontWeight" | "letterSpacing" | "lineHeight" | "textAlign" | "textTransform" | "children" | "sx" | "variant" | "align" | "gutterBottom" | "noWrap" | "paragraph" | "variantMapping"> & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme>, {}, {}>;
 export declare const DeviceListContainer: import("@emotion/styled").StyledComponent<import("@mui/system").BoxOwnProps<import("@mui/material/styles").Theme> & Omit<Omit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "ref"> & {
     ref?: ((instance: HTMLDivElement | null) => void) | import("react").RefObject<HTMLDivElement> | null | undefined;
 }, keyof import("@mui/system").BoxOwnProps<import("@mui/material/styles").Theme>> & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme>, {}, {}>;