chore: conflicts

deriv-com · Dec 12, 2024 · 80d3de9 · 80d3de9
1 parent 1b63531
commit 80d3de9
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 16 deletions.
diff --git a/...e/src/App/Containers/Modals/wallets-upgrade-logout-modal/wallets-upgrade-logout-modal.tsx b/...e/src/App/Containers/Modals/wallets-upgrade-logout-modal/wallets-upgrade-logout-modal.tsx
@@ -7,6 +7,7 @@ import { redirectToLogin } from '@deriv/shared';
 import { observer, useStore } from '@deriv/stores';
 import { getLanguage, Localize, localize } from '@deriv/translations';
 import { Analytics, TEvents } from '@deriv-com/analytics';
+import { requestOidcAuthentication } from '@deriv-com/auth-client';
 
 import './wallets-upgrade-logout-modal.scss';
 
@@ -29,12 +30,16 @@ const WalletsUpgradeLogoutModal = observer(() => {
     const { is_desktop } = ui;
     const account_mode = is_virtual ? 'demo' : 'real';
 
-    const { loginHandler, oAuthLogout } = useOauth2({
+    const { oAuthLogout, isOAuth2Enabled } = useOauth2({
         handleLogout: async () => {
             await logout();
-        },
-        handleLogin: async () => {
-            await redirectToLogin(false, getLanguage());
+            if (isOAuth2Enabled) {
+                await requestOidcAuthentication({
+                    redirectCallbackUri: `${window.location.origin}/callback`,
+                });
+            } else {
+                redirectToLogin(false, getLanguage());
+            }
         },
     });
 
@@ -48,9 +53,7 @@ const WalletsUpgradeLogoutModal = observer(() => {
             expires: 0.5, // 12 hours expiration time
             secure: true,
         });
-        oAuthLogout().then(async () => {
-            await loginHandler();
-        });
+        await oAuthLogout();
         trackAnalyticsEvent('click_cta', account_mode);
     };
 

diff --git a/packages/core/src/Modules/Callback/CallbackPage.tsx b/packages/core/src/Modules/Callback/CallbackPage.tsx
@@ -18,7 +18,14 @@ const CallbackPage = () => {
             }}
             renderReturnButton={() => {
                 return (
-                    <Button onClick={() => history.push('/')} secondary is_circular>
+                    <Button
+                        onClick={() => {
+                            history.push('/');
+                            window.location.reload();
+                        }}
+                        secondary
+                        is_circular
+                    >
                         <Localize i18n_default_text='Try again' />
                     </Button>
                 );

diff --git a/packages/hooks/src/useOauth2.ts b/packages/hooks/src/useOauth2.ts
@@ -1,3 +1,5 @@
+import { redirectToLogin } from '@deriv/shared';
+import { getLanguage } from '@deriv/translations';
 import {
     OAuth2Logout,
     requestOidcAuthentication,
@@ -20,13 +22,7 @@ import useGrowthbookGetFeatureValue from './useGrowthbookGetFeatureValue';
  * @param {{ handleLogout?: () => Promise<void> }} [options] - An object with an optional `handleLogout` property.
  * @returns {{ isOAuth2Enabled: boolean; oAuthLogout: () => Promise<void> }}
  */
-const useOauth2 = ({
-    handleLogout,
-    handleLogin,
-}: {
-    handleLogout: () => Promise<void>;
-    handleLogin?: () => Promise<void>;
-}) => {
+const useOauth2 = ({ handleLogout }: { handleLogout: () => Promise<void> }) => {
     const [oAuth2EnabledApps, OAuth2EnabledAppsInitialised] = useGrowthbookGetFeatureValue<string>({
         featureFlag: 'hydra_be',
     }) as unknown as [TOAuth2EnabledAppList, boolean];
@@ -39,7 +35,7 @@ const useOauth2 = ({
                 redirectCallbackUri: `${window.location.origin}/callback`,
             });
         }
-        await handleLogin?.();
+        redirectToLogin(false, getLanguage());
     };
 
     const logoutHandler = async () => {