Merge pull request #209 from IFRCGo/fix/permalink-redirect

Fix redirect issue
IFRCGo · Dec 17, 2024 · 99503a6 · 99503a6
2 parents 9894348 + c1e84ec
commit 99503a6
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/src/App/redirects/UnsubscribeRedirect.tsx b/src/App/redirects/UnsubscribeRedirect.tsx
@@ -17,13 +17,13 @@ export function Component() {
     const { subscriptionId, token } = useParams<UnsubscribeParams>();
     const navigate = useNavigate();
 
-    const UnsubscribeLink = (subscriptionId && token) ? ({
+    const unsubscribeLink = (subscriptionId && token) ? ({
         pathname: (generatePath(routes.unsubscribe.absolutePath, { subscriptionId, token })),
     })
         : routes.pageNotFound.path;
 
-    if (UnsubscribeLink) {
-        navigate(UnsubscribeLink);
+    if (unsubscribeLink) {
+        navigate(unsubscribeLink);
     }
 
     return null;

diff --git a/src/App/routes/index.tsx b/src/App/routes/index.tsx
@@ -358,7 +358,7 @@ const unsubscribe = customWrapRoute({
     parent: rootLayout,
     path: 'unsubscribe/:subscriptionId/:token',
     component: {
-        render: () => import('#views/Unsubscribe/index.tsx'),
+        render: () => import('#views/Unsubscribe'),
         props: {},
     },
     wrapperComponent: Auth,
@@ -372,7 +372,7 @@ const unsubscribeRedirect = customWrapRoute({
     parent: rootLayout,
     path: 'permalink/unsubscribe-user-alert-subscription/:subscriptionId/:token',
     component: {
-        render: () => import('../redirects/UnsubscribeRedirect.tsx'),
+        render: () => import('../redirects/UnsubscribeRedirect'),
         props: {},
     },
     wrapperComponent: Auth,

diff --git a/src/views/NewSubscriptionModal/i18n.json b/src/views/NewSubscriptionModal/i18n.json
@@ -23,6 +23,7 @@
         "newSubscriptionCreatedSuccessfully": "Subscription created successfully.",
         "newSubscriptionFailed": "Failed to create subscription",
         "subscriptionUpdatedSuccessfully": "Subscription updated successfully.",
-        "failedToUpdateSubscription": "Failed to update subscription."
+        "failedToUpdateSubscription": "Failed to update subscription.",
+        "updateSubscription": "Update"
     }
-}
+}
diff --git a/src/views/NewSubscriptionModal/index.tsx b/src/views/NewSubscriptionModal/index.tsx
@@ -469,7 +469,9 @@ function NewSubscriptionModal(props: Props) {
                     onClick={handleFormSubmit}
                     disabled={pristine || loadingSubscription}
                 >
-                    {strings.createNewSubscription}
+                    {(isDefined(subscription?.id)
+                        ? strings.updateSubscription : strings.createNewSubscription
+                    )}
                 </Button>
             )}
             footerContentClassName={styles.createButton}