From f0d49f6b21316779367cc9fb344571331ebc58b0 Mon Sep 17 00:00:00 2001 From: Aman Harwara Date: Tue, 7 Feb 2023 12:36:37 +0530 Subject: [PATCH] fix(desktop): Fixed issue where some links on desktop would not correctly open in the browser --- .../Components/Preferences/PreferencesMenuView.tsx | 5 ++++- .../Components/PurchaseFlow/PurchaseFlowFunctions.ts | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/packages/web/src/javascripts/Components/Preferences/PreferencesMenuView.tsx b/packages/web/src/javascripts/Components/Preferences/PreferencesMenuView.tsx index c4fd7294d..1f7473ce9 100644 --- a/packages/web/src/javascripts/Components/Preferences/PreferencesMenuView.tsx +++ b/packages/web/src/javascripts/Components/Preferences/PreferencesMenuView.tsx @@ -7,7 +7,7 @@ import PreferencesMenuItem from './PreferencesComponents/MenuItem' import { PreferencesMenu } from './PreferencesMenu' import { PreferenceId } from '@standardnotes/ui-services' import { useApplication } from '../ApplicationProvider' -import { classNames } from '@standardnotes/snjs' +import { classNames, Environment } from '@standardnotes/snjs' import { isIOS } from '@/Utils' type Props = { @@ -49,6 +49,9 @@ const PreferencesMenuView: FunctionComponent = ({ menu }) => { if (application.isNativeMobileWeb()) { application.mobileDevice().openUrl(link) return + } else if (application.environment === Environment.Desktop) { + application.desktopDevice?.openUrl(link) + return } window.open(link, '_blank') diff --git a/packages/web/src/javascripts/Components/PurchaseFlow/PurchaseFlowFunctions.ts b/packages/web/src/javascripts/Components/PurchaseFlow/PurchaseFlowFunctions.ts index d3fb0c353..e2ba7bf7a 100644 --- a/packages/web/src/javascripts/Components/PurchaseFlow/PurchaseFlowFunctions.ts +++ b/packages/web/src/javascripts/Components/PurchaseFlow/PurchaseFlowFunctions.ts @@ -1,5 +1,6 @@ import { WebApplication } from '@/Application/Application' import { isDesktopApplication } from '@/Utils' +import { Environment } from '@standardnotes/snjs' import { RouteType } from '@standardnotes/ui-services' export const getPurchaseFlowUrl = async (application: WebApplication): Promise => { @@ -30,6 +31,8 @@ export const loadPurchaseFlowUrl = async (application: WebApplication): Promise< if (application.isNativeMobileWeb()) { application.mobileDevice().openUrl(finalUrl) + } else if (application.environment === Environment.Desktop) { + application.desktopDevice?.openUrl(finalUrl) } else { const windowProxy = window.open('', '_blank') ;(windowProxy as WindowProxy).location = finalUrl