From fcc4c3374d85b33755f852bcc559db0a8eb5115a Mon Sep 17 00:00:00 2001
From: Blaster4385 <venkateshchaturvedi12@gmail.com>
Date: Thu, 25 Aug 2022 11:44:08 +0530
Subject: Misc changes and add more translation

---
 client/src/pages/CheckStatus/EnrollmentStatus.jsx |  3 ---
 client/src/pages/CheckStatus/StatusOtp.jsx        | 21 +++++++--------------
 client/src/pages/CheckStatus/UpdateStatus.jsx     |  3 ---
 3 files changed, 7 insertions(+), 20 deletions(-)

(limited to 'client/src/pages/CheckStatus')

diff --git a/client/src/pages/CheckStatus/EnrollmentStatus.jsx b/client/src/pages/CheckStatus/EnrollmentStatus.jsx
index 9ae0026..d1e1f4d 100644
--- a/client/src/pages/CheckStatus/EnrollmentStatus.jsx
+++ b/client/src/pages/CheckStatus/EnrollmentStatus.jsx
@@ -46,9 +46,6 @@ const EnrollmentStatus = () => {
             <p className={styles.status__content}>
               {t('YOUR_AADHAAR_STATUS_IS_APPROVED')}
             </p>
-            <p className={styles.status__content}>
-              {t('PRINT_YOUR_AADHAAR_CARD_FROM_WEBSITE')}
-            </p>
           </>
         )}
         <Button
diff --git a/client/src/pages/CheckStatus/StatusOtp.jsx b/client/src/pages/CheckStatus/StatusOtp.jsx
index d7d62d1..4955ab4 100644
--- a/client/src/pages/CheckStatus/StatusOtp.jsx
+++ b/client/src/pages/CheckStatus/StatusOtp.jsx
@@ -12,6 +12,7 @@ import { toast, ToastContainer } from 'react-toastify'
 import PopUpModal from '../../components/Modal/Modal'
 
 import styles from './StatusOtp.module.css'
+import Spinner from '../../components/Spinner/Spinner'
 
 const StatusOtp = () => {
   const navigate = useNavigate()
@@ -68,7 +69,7 @@ const StatusOtp = () => {
       }
     })
     if (isLoading) {
-      return <div>{t('loading')}</div>
+      return <Spinner heading='STATUS' />
     }
 
     if (isError) {
@@ -85,7 +86,7 @@ const StatusOtp = () => {
     })
 
     if (isLoading) {
-      return <div>{t('loading')}</div>
+      return <Spinner heading='STATUS' />
     }
 
     if (isError) {
@@ -97,6 +98,8 @@ const StatusOtp = () => {
     }
   }
 
+  const description = ['CLICK_ON_SEND_OTP', 'YOU_WILL_RECIEVE_AN_OTP_ON_YOUR_MOBILE_NUMBER', 'YOU_CAN_RESEND_THE_OTP_AFTER_30_SECONDS_IF_YOU_HAVENT_RECEIVED_IT_YET', 'CLICK_ON_VERIFY_OTP_TO_VERIFY_YOUR_MOBILE_NUMBER']
+
   return (
     <>
       <ToastContainer
@@ -106,22 +109,12 @@ const StatusOtp = () => {
       />
       <Header subheading={`${t('STATUS')}`} />
       <PopUpModal
-        title="Verify your mobile number"
+        title="VERIFY_YOUR_MOBILE_NUMBER"
         image={`${process.env.PUBLIC_URL}/assets/images/otp.svg`}
         description={
           <>
             <ul>
-              <li className="list__item">Click on &quot;SEND OTP&quot;</li>
-              <li className="list__item">
-                You will recieve an OTP on your entered mobile number
-              </li>
-              <li className="list__item">
-                You can &quot;RESEND&quot; the OTP after 30 seconds, if you
-                haven&apos;t received it yet.
-              </li>
-              <li className="list__item">
-                Click on &quot;VERIFY OTP&quot; to verify your mobile number
-              </li>
+              {description.map((item) => (<li className="list__item" key='id'>{t(item)}</li>))}
             </ul>
           </>
         }
diff --git a/client/src/pages/CheckStatus/UpdateStatus.jsx b/client/src/pages/CheckStatus/UpdateStatus.jsx
index 431f9d5..a9a4b58 100644
--- a/client/src/pages/CheckStatus/UpdateStatus.jsx
+++ b/client/src/pages/CheckStatus/UpdateStatus.jsx
@@ -46,9 +46,6 @@ const UpdateStatus = () => {
             <p className={styles.status__content}>
               {t('YOUR_AADHAAR_UPDATE_STATUS_IS_APPROVED')}
             </p>
-            <p className={styles.status__content}>
-              {t('PRINT_YOUR_AADHAAR_CARD_FROM_WEBSITE')}
-            </p>
           </>
         )}
         <Button
-- 
cgit