Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion frontends/web/src/routes/exchange/exchange.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export const Exchange = ({ code, accounts, deviceIDs }: TProps) => {
if (!exchange) {
return;
}
navigate(`/exchange/${exchange}/${activeTab}/${code}`);
navigate(`/exchange/${exchange}/${activeTab}/${code}/${selectedRegion}`);
};

const handleChangeRegion = (newValue: SingleValue<TOption>) => {
Expand Down
15 changes: 12 additions & 3 deletions frontends/web/src/routes/exchange/pocket.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,14 @@ import { parseExternalBtcAmount } from '@/api/coins';
interface TProps {
code: AccountCode;
action: TExchangeAction;
region: string;
}

export const Pocket = ({ code, action }: TProps) => {
export const Pocket = ({
code,
action,
region,
}: TProps) => {
const { t } = useTranslation();
const navigate = useNavigate();

Expand All @@ -60,12 +65,16 @@ export const Pocket = ({ code, action }: TProps) => {
useEffect(() => {
getPocketURL(action).then(response => {
if (response.success) {
setIframeUrl(response.url);
const url = new URL(response.url);
if (region) {
url.searchParams.set('region', region);
}
setIframeUrl(url.href);
} else {
alertUser(t('unknownError', { errorMessage: response.errorMessage }));
}
});
}, [action, t]);
}, [action, region, t]);

useEffect(() => {
if (config) {
Expand Down
7 changes: 6 additions & 1 deletion frontends/web/src/routes/router.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -182,13 +182,15 @@ export const AppRouter = ({ devices, deviceIDs, devicesKey, accounts, activeAcco
<Pocket
code={''}
action="buy"
region={''}
/>
</InjectParams>);

const PocketSellEl = (<InjectParams>
<Pocket
code={''}
action="sell"
region={''}
/>
</InjectParams>);

Expand All @@ -205,7 +207,6 @@ export const AppRouter = ({ devices, deviceIDs, devicesKey, accounts, activeAcco
<MobileSettings
devices={devices}
hasAccounts={hasAccounts}

/>
</InjectParams>);

Expand Down Expand Up @@ -258,9 +259,13 @@ export const AppRouter = ({ devices, deviceIDs, devicesKey, accounts, activeAcco
<Route path=":code" element={ExchangeInfoEl} />
</Route>
<Route path="btcdirect/buy/:code" element={BTCDirectEl} />
<Route path="btcdirect/buy/:code/:region" element={BTCDirectEl} />
<Route path="moonpay/buy/:code" element={MoonpayEl} />
<Route path="moonpay/buy/:code/:region" element={MoonpayEl} />
<Route path="pocket/buy/:code" element={PocketBuyEl} />
<Route path="pocket/buy/:code/:region" element={PocketBuyEl} />
<Route path="pocket/sell/:code" element={PocketSellEl} />
<Route path="pocket/sell/:code/:region" element={PocketSellEl} />
<Route path="select/:code" element={ExchangeEl} />
<Route path="btcdirect-otc" element={<BTCDirectOTC/>} />
</Route>
Expand Down