From bb8bd5437f08b71296eb558751dc590127d181c3 Mon Sep 17 00:00:00 2001
From: Andrei Dekterev <avdekterev@gmail.com>
Date: Thu, 6 Oct 2022 15:44:06 +0600
Subject: [PATCH] fix(#2901): add error for empty state

---
 src/config/lexics/payment.tsx                               | 1 +
 src/features/AddCardForm/components/Form/hooks/index.tsx    | 4 +++-
 .../AddCardForm/components/Form/hooks/validateFields.tsx    | 2 ++
 src/features/CardsStore/hooks/index.tsx                     | 6 ++++++
 src/requests/getUsaStates.tsx                               | 2 +-
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/config/lexics/payment.tsx b/src/config/lexics/payment.tsx
index e9461ae2..7a1e7ed3 100644
--- a/src/config/lexics/payment.tsx
+++ b/src/config/lexics/payment.tsx
@@ -17,6 +17,7 @@ export const paymentLexics = {
   error_empty_city: 15754,
   error_empty_country: 15753,
   error_empty_name: 15290,
+  error_empty_state: 19821,
   error_payment_unsuccessful: 14446,
   if_you_cancel: 18189,
   next_payment: 18183,
diff --git a/src/features/AddCardForm/components/Form/hooks/index.tsx b/src/features/AddCardForm/components/Form/hooks/index.tsx
index cf67a2ec..b1f96bd5 100644
--- a/src/features/AddCardForm/components/Form/hooks/index.tsx
+++ b/src/features/AddCardForm/components/Form/hooks/index.tsx
@@ -132,6 +132,7 @@ export const useFormSubmit = ({
     setCity('')
     setAddress('')
     setSelectedCountry(null)
+    setSelectedState(null)
     elements?.getElement(CardNumberElement)?.clear()
     elements?.getElement(CardCvcElement)?.clear()
     elements?.getElement(CardExpiryElement)?.clear()
@@ -262,6 +263,7 @@ export const useFormSubmit = ({
       city,
       country: selectedCountry?.name || '',
       name,
+      state: (selectedState?.name_eng || ''),
     })
 
     if (fieldError) {
@@ -278,7 +280,7 @@ export const useFormSubmit = ({
         address_city: city,
         address_country: selectedCountry?.name || '',
         address_line1: address,
-        address_state: selectedState?.name_eng,
+        address_state: selectedState?.name_eng || '',
         name,
       },
     )
diff --git a/src/features/AddCardForm/components/Form/hooks/validateFields.tsx b/src/features/AddCardForm/components/Form/hooks/validateFields.tsx
index 0b0527e4..298a7d5b 100644
--- a/src/features/AddCardForm/components/Form/hooks/validateFields.tsx
+++ b/src/features/AddCardForm/components/Form/hooks/validateFields.tsx
@@ -9,11 +9,13 @@ type fieldsType = {
   city: string,
   country: string,
   name: string,
+  state: string,
 }
 
 export const validateFields = (fields: fieldsType) => {
   if (!fields.name) return 'error_empty_name'
   if (!fields.country) return 'error_empty_country'
+  if (!fields.state && fields.country === 'United States of America') return 'error_empty_state'
   if (size(fields.city) < 3) return 'error_empty_city'
   if (size(fields.address) < 10) return 'error_empty_address'
   return false
diff --git a/src/features/CardsStore/hooks/index.tsx b/src/features/CardsStore/hooks/index.tsx
index ce7216a6..d4ff35e6 100644
--- a/src/features/CardsStore/hooks/index.tsx
+++ b/src/features/CardsStore/hooks/index.tsx
@@ -54,6 +54,12 @@ export const useBankCards = () => {
 
   useEffect(() => {
     setIsHighlightsPage(window.location.pathname === PAGES.highlights)
+
+    return () => {
+      setError('')
+      setLastCard(null)
+      setIsHighlightsPage(false)
+    }
   }, [cards])
 
   return {
diff --git a/src/requests/getUsaStates.tsx b/src/requests/getUsaStates.tsx
index 209e7920..f6275f45 100644
--- a/src/requests/getUsaStates.tsx
+++ b/src/requests/getUsaStates.tsx
@@ -17,6 +17,6 @@ export const getUsaStates = (): Promise<Array<UsaStateType>> => {
 
   return callApi({
     config,
-    url: `${API_ROOT}/v1/data/usa-states`,
+    url: `${API_ROOT}/v1/data/usa/states`,
   })
 }