feat(ui): update notification route

cardano-foundation · Jul 16, 2024 · 43cb955 · 43cb955
1 parent bf20971
commit 43cb955
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 18 deletions.
diff --git a/src/locales/en/en.json b/src/locales/en/en.json
@@ -963,16 +963,24 @@
         "accept": "Accept",
         "decline": "Decline",
         "cancel": "Cancel",
-        "choosecredential": "Choose credential"
+        "back": "Back",
+        "choosecredential": "Choose credential",
+        "providecredential": "Provide credential"
       },
       "credential": {
         "request": {
-          "title": "Credential request",
-          "requestfrom": "Request from",
-          "requestedcredential": "Requested credential",
-          "informationrequired": "Information required",
-          "alert": {
-            "textdecline": "Are you sure you want to decline this credential request? You won't be able to change your decision later."
+          "information": {
+            "title": "Credential request",
+            "requestfrom": "Request from",
+            "requestedcredential": "Requested credential",
+            "informationrequired": "Information required",
+            "alert": {
+              "textdecline": "Are you sure you want to decline this credential request? You won't be able to change your decision later."
+            }
+          },
+          "choosecredential": {
+            "description": "Select the most appropriate {{requestCred}} to provide the required information",
+            "title": "Choose credential"
           }
         },
         "receive": {

diff --git a/src/routes/backRoute/backRoute.ts b/src/routes/backRoute/backRoute.ts
@@ -188,7 +188,7 @@ const backRoute: Record<string, any> = {
   [RoutePath.CONNECTION_DETAILS]: {
     updateRedux: [removeCurrentRoute],
   },
-  [RoutePath.NOTIFICATION_DETAILS]: {
+  [TabsRoutePath.NOTIFICATION_DETAILS]: {
     updateRedux: [removeCurrentRoute],
   },
   [TabsRoutePath.IDENTIFIER_DETAILS]: {

diff --git a/src/routes/index.tsx b/src/routes/index.tsx
@@ -34,7 +34,7 @@ const Routes = () => {
 
   useEffect(() => {
     if (!routes.length) dispatch(setCurrentRoute({ path: nextPath.pathname }));
-  }, [routes, nextPath.pathname]);
+  }, [routes, nextPath.pathname, dispatch]);
 
   return (
     <IonReactRouter>
@@ -85,12 +85,6 @@ const Routes = () => {
           component={ConnectionDetails}
           exact
         />
-        <Route
-          path={RoutePath.NOTIFICATION_DETAILS}
-          component={NotificationDetails}
-          exact
-        />
-
         {tabsRoutes.map((tab, index: number) => {
           return (
             <Route
@@ -116,6 +110,11 @@ const Routes = () => {
           component={CredentialDetails}
           exact
         />
+        <Route
+          path={TabsRoutePath.NOTIFICATION_DETAILS}
+          component={NotificationDetails}
+          exact
+        />
         <Redirect
           exact
           from="/"

diff --git a/src/routes/nextRoute/nextRoute.ts b/src/routes/nextRoute/nextRoute.ts
@@ -67,7 +67,7 @@ const getNextCredentialDetailsRoute = () => {
 };
 
 const getNextNotificationsRoute = () => {
-  const path = RoutePath.NOTIFICATION_DETAILS;
+  const path = TabsRoutePath.NOTIFICATION_DETAILS;
   return { pathname: path };
 };
 
@@ -255,7 +255,7 @@ const nextRoute: Record<string, any> = {
     nextPath: () => getNextNotificationsRoute(),
     updateRedux: [],
   },
-  [RoutePath.NOTIFICATION_DETAILS]: {
+  [TabsRoutePath.NOTIFICATION_DETAILS]: {
     nextPath: () => getNextNotificationDetailsRoute(),
     updateRedux: [],
   },

diff --git a/src/routes/paths.ts b/src/routes/paths.ts
@@ -8,7 +8,6 @@ enum RoutePath {
   CREATE_PASSWORD = "/createpassword",
   SSI_AGENT = "/ssiagent",
   CONNECTION_DETAILS = "/connectiondetails",
-  NOTIFICATION_DETAILS = "/notificationdetails",
   VERIFY_RECOVERY_SEED_PHRASE = "/verifyrecoveryseedphrase",
 }
 
@@ -21,6 +20,7 @@ enum TabsRoutePath {
   MENU = "/tabs/menu",
   IDENTIFIER_DETAILS = "/tabs/identifiers/:id",
   CREDENTIAL_DETAILS = "/tabs/credentials/:id",
+  NOTIFICATION_DETAILS = "/tabs/notifications/:id",
 }
 
 const PublicRoutes = [