Merge branch 'develop' of https://github.com/mosip/inji-verify into i…

…njiver-794-online-sharing-car-portal Signed-off-by: srikanth716 <srikanthsri7447@gmail.com>
mosip · Nov 27, 2024 · 0efff8d · 0efff8d
2 parents 3256e30 + d4772cc
commit 0efff8d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 20 deletions.
diff --git a/ui/src/App.tsx b/ui/src/App.tsx
@@ -1,21 +1,20 @@
 import React, { useEffect } from "react";
 import "./App.css";
-import { Pages } from "./utils/config";
 import Home from "./pages/Home";
 import Offline from "./pages/Offline";
-import Scan from "./pages/Scan";
+import { Scan } from "./pages/Scan";
 import { RouterProvider, createBrowserRouter } from "react-router-dom";
 import AlertMessage from "./components/commons/AlertMessage";
 import PreloadImages from "./components/commons/PreloadImages";
 import OvpRedirect from "./pages/OvpRedirect";
 import PageNotFound404 from "./pages/PageNotFound404";
-import { Verify } from "./pages/Verify";
-import { goToHomeScreen } from "./redux/features/verification/verification.slice";
+import { Pages } from "./utils/config";
+import { useAppSelector } from "./redux/hooks";
+import store, { RootState } from "./redux/store";
+import { isRTL } from "./utils/i18n";
 import { VerificationMethod } from "./types/data-types";
-import store from "./redux/store";
-import { useAppSelector } from './redux/hooks';
-import { RootState } from './redux/store';
-import { isRTL } from './utils/i18n';
+import { goToHomeScreen } from "./redux/features/verification/verification.slice";
+import { Verify } from "./pages/Verify";
 
 function switchToVerificationMethod(method: VerificationMethod) {
   store.dispatch(goToHomeScreen({ method }));
@@ -52,10 +51,7 @@ const router = createBrowserRouter([
   },
 ]);
 
-const preloadImages = [
-  "/assets/images/under_construction.svg",
-  "/assets/images/inji-logo.svg",
-];
+const preloadImages = ['/assets/images/under_construction.svg', '/assets/images/inji-logo.svg'];
 
 function App() {
     const language = useAppSelector((state: RootState) => state.common.language);

diff --git a/ui/src/components/Home/VerificationSection/QrScanner.tsx b/ui/src/components/Home/VerificationSection/QrScanner.tsx
@@ -208,7 +208,7 @@ function QrScanner() {
             stopVideoStream();
             dispatch(goToHomeScreen({}));
           }}
-          className="absolute top-7 right-4 lg:hidden bg-gray-800 text-white p-2 rounded-full hover:bg-gray-700 focus:outline-none"
+          className="absolute top-7 right-4 lg:hidden bg-gray-800 text-white p-2 rounded-full hover:bg-gray-700 focus:outline-none z-[60]"
           aria-label="Close Scanner"
         >
           ✕

diff --git a/ui/src/pages/Scan.tsx b/ui/src/pages/Scan.tsx
@@ -3,7 +3,7 @@ import PageTemplate from "../components/PageTemplate";
 import VerificationSection from "../components/Home/VerificationSection";
 import VerificationProgressTracker from "../components/Home/VerificationProgressTracker";
 
-export default function Scan() {
+export const Scan = () => {
   return (
     <PageTemplate>
       <div className="grid grid-cols-12">
@@ -16,4 +16,4 @@ export default function Scan() {
       </div>
     </PageTemplate>
   );
-}
+};
diff --git a/ui/src/types/data-types.ts b/ui/src/types/data-types.ts
@@ -36,11 +36,7 @@ export type AlertInfo = {
   autoHideDuration?: number;
 };
 
-export type VerificationMethod =
-  | "SCAN"
-  | "UPLOAD"
-  | "VERIFY"
-  | "TO_BE_SELECTED";
+export type VerificationMethod = "SCAN" | "UPLOAD" | "VERIFY" | "TO_BE_SELECTED";
 
 export type InternetConnectionStatus =
   | "ONLINE"