summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorOliver <oliver@mohlin.dev>2024-12-11 16:14:49 +0100
committerMarkus Pettersson <markus.pettersson@mullvad.net>2024-12-17 12:15:40 +0100
commit5446b058713d314837b7ff98249a9f90398dc796 (patch)
treee8e101019bc808bd1605f289eec52cddbd778ba8
parentf56eb3f51b34a3ba1007e41193be3f7a6baf9709 (diff)
downloadmullvadvpn-5446b058713d314837b7ff98249a9f90398dc796.tar.xz
mullvadvpn-5446b058713d314837b7ff98249a9f90398dc796.zip
Move renderer specific notifications to renderer folder
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/components/NotificationArea.tsx6
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/lib/notifications/index.ts2
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/lib/notifications/new-device.ts (renamed from desktop/packages/mullvad-vpn/src/shared/notifications/new-device.ts)6
-rw-r--r--desktop/packages/mullvad-vpn/src/renderer/lib/notifications/new-version.ts (renamed from desktop/packages/mullvad-vpn/src/shared/notifications/new-version.ts)8
-rw-r--r--desktop/packages/mullvad-vpn/src/shared/notifications/index.ts1
5 files changed, 13 insertions, 10 deletions
diff --git a/desktop/packages/mullvad-vpn/src/renderer/components/NotificationArea.tsx b/desktop/packages/mullvad-vpn/src/renderer/components/NotificationArea.tsx
index 6aac11c9d5..002f23598f 100644
--- a/desktop/packages/mullvad-vpn/src/renderer/components/NotificationArea.tsx
+++ b/desktop/packages/mullvad-vpn/src/renderer/components/NotificationArea.tsx
@@ -11,16 +11,18 @@ import {
InAppNotificationProvider,
InAppNotificationTroubleshootInfo,
InconsistentVersionNotificationProvider,
- NewVersionNotificationProvider,
ReconnectingNotificationProvider,
UnsupportedVersionNotificationProvider,
UpdateAvailableNotificationProvider,
} from '../../shared/notifications';
-import { NewDeviceNotificationProvider } from '../../shared/notifications/new-device';
import { useAppContext } from '../context';
import useActions from '../lib/actionsHook';
import { transitions, useHistory } from '../lib/history';
import { formatHtml } from '../lib/html-formatter';
+import {
+ NewDeviceNotificationProvider,
+ NewVersionNotificationProvider,
+} from '../lib/notifications';
import { RoutePath } from '../lib/routes';
import accountActions from '../redux/account/actions';
import { IReduxState, useSelector } from '../redux/store';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/notifications/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/notifications/index.ts
new file mode 100644
index 0000000000..a03af00d06
--- /dev/null
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/notifications/index.ts
@@ -0,0 +1,2 @@
+export * from './new-device';
+export * from './new-version';
diff --git a/desktop/packages/mullvad-vpn/src/shared/notifications/new-device.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/notifications/new-device.ts
index 7d0fe9f299..f5bd085d89 100644
--- a/desktop/packages/mullvad-vpn/src/shared/notifications/new-device.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/notifications/new-device.ts
@@ -1,8 +1,8 @@
import { sprintf } from 'sprintf-js';
-import { messages } from '../../shared/gettext';
-import { capitalizeEveryWord } from '../string-helpers';
-import { InAppNotification, InAppNotificationProvider } from './notification';
+import { messages } from '../../../shared/gettext';
+import { InAppNotification, InAppNotificationProvider } from '../../../shared/notifications';
+import { capitalizeEveryWord } from '../../../shared/string-helpers';
interface NewDeviceNotificationContext {
shouldDisplay: boolean;
diff --git a/desktop/packages/mullvad-vpn/src/shared/notifications/new-version.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/notifications/new-version.ts
index 991266adbe..73ccf61525 100644
--- a/desktop/packages/mullvad-vpn/src/shared/notifications/new-version.ts
+++ b/desktop/packages/mullvad-vpn/src/renderer/lib/notifications/new-version.ts
@@ -1,7 +1,7 @@
-import { RoutePath } from '../../renderer/lib/routes';
-import { messages } from '../gettext';
-import { IChangelog } from '../ipc-types';
-import { InAppNotification, InAppNotificationProvider } from './notification';
+import { messages } from '../../../shared/gettext';
+import { IChangelog } from '../../../shared/ipc-types';
+import { InAppNotification, InAppNotificationProvider } from '../../../shared/notifications';
+import { RoutePath } from '../routes';
interface NewVersionNotificationContext {
currentVersion: string;
diff --git a/desktop/packages/mullvad-vpn/src/shared/notifications/index.ts b/desktop/packages/mullvad-vpn/src/shared/notifications/index.ts
index 615ce42250..5321917af6 100644
--- a/desktop/packages/mullvad-vpn/src/shared/notifications/index.ts
+++ b/desktop/packages/mullvad-vpn/src/shared/notifications/index.ts
@@ -7,7 +7,6 @@ export * from './disconnected';
export * from './daemon-disconnected';
export * from './error';
export * from './inconsistent-version';
-export * from './new-version';
export * from './notification';
export * from './reconnecting';
export * from './unsupported-version';