Move renderer specific notifications to renderer folder

mullvad · Dec 11, 2024 · 595c730 · 595c730
1 parent 425cb58
commit 595c730
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 10 deletions.
diff --git 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
@@ -0,0 +1,2 @@
+export * from './new-device';
+export * from './new-version';
diff --git a/...pn/src/shared/notifications/new-device.ts → .../renderer/lib/notifications/new-device.ts b/...pn/src/shared/notifications/new-device.ts → .../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/...n/src/shared/notifications/new-version.ts → ...renderer/lib/notifications/new-version.ts b/...n/src/shared/notifications/new-version.ts → ...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
@@ -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';
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		export * from './new-device';
		export * from './new-version';