Skip to content

Fix wallet redirect handling #18781

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fix wallet redirect handling #18781

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
551a466
fix: improve wallet redirect handling
habib-deriv Aug 1, 2025
0622047
Update packages/cashier/src/containers/routes/binary-routes.tsx
habib-deriv Aug 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions packages/cashier/src/containers/routes/binary-routes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Switch } from 'react-router-dom';

import { Loading } from '@deriv/components';
import { useIsHubRedirectionEnabled } from '@deriv/hooks';
import { deriv_urls, getDomainUrl } from '@deriv/shared';
import { getDomainUrl } from '@deriv/shared';
import { useStore } from '@deriv/stores';

import getRoutesConfig from 'Constants/routes-config';
Expand Down Expand Up @@ -32,25 +32,25 @@ const BinaryRoutes = (props: TBinaryRoutesProps) => {
const STAGING_REDIRECT_URL = `https://staging-hub.${getDomainUrl()}/tradershub`;

useEffect(() => {
if (has_wallet === undefined) {
// eslint-disable-next-line no-console
console.error('Unable to retrieve wallet information from API.');
}

if (
isHubRedirectionEnabled &&
has_wallet &&
has_wallet &&
!is_logging_out &&
is_logged_in &&
!prevent_redirect_to_hub &&
is_client_store_initialized
) {
const redirectUrl = process.env.NODE_ENV === 'production' ? PRODUCTION_REDIRECT_URL : STAGING_REDIRECT_URL;

const domain = /deriv\.(com|me|be)/.test(window.location.hostname)
? deriv_urls.DERIV_HOST_NAME
: window.location.hostname;
Cookies.set('wallet_account', true, { domain });

const url_query_string = window.location.search;
const url_params = new URLSearchParams(url_query_string);
const account_currency = window.sessionStorage.getItem('account') || url_params.get('account');
localStorage.setItem('wallet_redirect_done', true);
localStorage.setItem('wallet_redirect_done', 'true');
const redirect_path = `${redirectUrl}/redirect?action=redirect_to&redirect_to=wallet${account_currency ? `&account=${account_currency}` : ''}`;
window.location.href = redirect_path;
}
Expand All @@ -59,6 +59,7 @@ const BinaryRoutes = (props: TBinaryRoutesProps) => {
if (prevent_single_login && isHubRedirectionLoaded && is_client_store_initialized && shouldStayInDerivApp) {
setPreventSingleLogin(false);
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [
isHubRedirectionLoaded,
isHubRedirectionEnabled,
Expand Down
Loading