From 778839a6de1a53fccd71fcc94b5c38288d7d91cf Mon Sep 17 00:00:00 2001
From: Gitanjli <96485413+gitanjli525@users.noreply.github.com>
Date: Wed, 29 May 2024 20:49:50 +0530
Subject: [PATCH] chore: UI fix audit (#753)

---
 src/components/DateRangeField.res                        | 2 +-
 .../AuthModule/BasicAuth/BasicEmailVerifyScreen.res      | 2 +-
 .../AuthModule/TotpAuth/TotpEmailVerifyScreen.res        | 2 +-
 src/screens/Analytics/Logs/LogUtils/AuditLogUI.res       | 3 +++
 .../HSwitchProfile/HSwitchProfileSettingsEntity.res      | 9 ++++++---
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/components/DateRangeField.res b/src/components/DateRangeField.res
index 34c02de72..615ed91f6 100644
--- a/src/components/DateRangeField.res
+++ b/src/components/DateRangeField.res
@@ -528,7 +528,7 @@ module Base = {
         : showTime
         ? `${startDateStr} ${startTimeStr} - ${endDateStr} ${endTimeStr}`
         : endDateVal->isEmptyString
-        ? `${startDateStr}`
+        ? `${startDateStr} - Now`
         : `${startDateStr} ${startDateStr === buttonText ? "" : "-"} ${endDateStr}`
     }
 
diff --git a/src/entryPoints/AuthModule/BasicAuth/BasicEmailVerifyScreen.res b/src/entryPoints/AuthModule/BasicAuth/BasicEmailVerifyScreen.res
index 2b4ccc88b..8e7be1f40 100644
--- a/src/entryPoints/AuthModule/BasicAuth/BasicEmailVerifyScreen.res
+++ b/src/entryPoints/AuthModule/BasicAuth/BasicEmailVerifyScreen.res
@@ -41,6 +41,6 @@ let make = (~setAuthType) => {
   }
 
   <EmailVerifyScreen
-    errorMessage onClick trasitionMessage="Verifing... You will be redirecting.."
+    errorMessage onClick trasitionMessage="Verifying... You will be redirecting.."
   />
 }
diff --git a/src/entryPoints/AuthModule/TotpAuth/TotpEmailVerifyScreen.res b/src/entryPoints/AuthModule/TotpAuth/TotpEmailVerifyScreen.res
index 308d1e7d4..995127bb5 100644
--- a/src/entryPoints/AuthModule/TotpAuth/TotpEmailVerifyScreen.res
+++ b/src/entryPoints/AuthModule/TotpAuth/TotpEmailVerifyScreen.res
@@ -49,6 +49,6 @@ let make = () => {
   }
 
   <EmailVerifyScreen
-    errorMessage onClick trasitionMessage="Verifing... You will be redirecting.."
+    errorMessage onClick trasitionMessage="Verifying... You will be redirecting.."
   />
 }
diff --git a/src/screens/Analytics/Logs/LogUtils/AuditLogUI.res b/src/screens/Analytics/Logs/LogUtils/AuditLogUI.res
index ad7a79b4d..346ecb016 100644
--- a/src/screens/Analytics/Logs/LogUtils/AuditLogUI.res
+++ b/src/screens/Analytics/Logs/LogUtils/AuditLogUI.res
@@ -193,6 +193,9 @@ let make = (~id, ~urls, ~logType: LogTypes.pageType) => {
   open OrderUtils
   <PageLoaderWrapper
     screenState
+    customLoader={<p className=" text-center text-sm text-jp-gray-900">
+      {"Crunching the latest data…"->React.string}
+    </p>}
     customUI={<NoDataFound
       message={`No logs available for this ${(logType :> string)->String.toLowerCase}`}
     />}>
diff --git a/src/screens/Settings/HSwitchProfile/HSwitchProfileSettingsEntity.res b/src/screens/Settings/HSwitchProfile/HSwitchProfileSettingsEntity.res
index c09c4cd3c..efa7f9d4a 100644
--- a/src/screens/Settings/HSwitchProfile/HSwitchProfileSettingsEntity.res
+++ b/src/screens/Settings/HSwitchProfile/HSwitchProfileSettingsEntity.res
@@ -3,12 +3,13 @@ open SwitchMerchantUtils
 type columns =
   | MerchantName
   | RoleName
+  | MerchantId
 
-let visibleColumns = [MerchantName, RoleName]
+let visibleColumns = [MerchantId, MerchantName, RoleName]
 
-let defaultColumns = [MerchantName, RoleName]
+let defaultColumns = [MerchantId, MerchantName, RoleName]
 
-let allColumns = [MerchantName, RoleName]
+let allColumns = [MerchantId, MerchantName, RoleName]
 
 let itemToObjMapper = dict => {
   open LogicUtils
@@ -28,6 +29,7 @@ let getHeading = colType => {
   switch colType {
   | MerchantName => Table.makeHeaderInfo(~key="merchant_name", ~title="Merchant Name", ())
   | RoleName => Table.makeHeaderInfo(~key="role", ~title="Role", ())
+  | MerchantId => Table.makeHeaderInfo(~key="merchant id", ~title="Merchant Id", ())
   }
 }
 
@@ -42,6 +44,7 @@ let getCell = (item: switchMerchantListResponse, colType): Table.cell => {
       </div>,
       "",
     )
+  | MerchantId => Text(item.merchant_id)
   }
 }