From 2dd257fff2ff224a452d81cfd57d6cb220dd1b2a Mon Sep 17 00:00:00 2001
From: Shailesh Baldaniya <shaileshbaldaniya351@gmail.com>
Date: Thu, 29 Apr 2021 13:14:49 +0530
Subject: [PATCH] Fixe Imports

---
 app/settings/client/index.js                                | 5 +++++
 app/settings/server/index.js                                | 6 ++++++
 client/importPackages.ts                                    | 2 +-
 client/importServiceWorker.js                               | 2 +-
 .../notifications/updateUserDetailsForPushSubscription.js   | 2 +-
 .../room/contextualBar/ExportMessages/MailExportForm.js     | 2 +-
 6 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 app/settings/client/index.js
 create mode 100644 app/settings/server/index.js

diff --git a/app/settings/client/index.js b/app/settings/client/index.js
new file mode 100644
index 000000000000..481b58fd8a8a
--- /dev/null
+++ b/app/settings/client/index.js
@@ -0,0 +1,5 @@
+import { settings } from './lib/settings';
+
+export {
+	settings,
+};
diff --git a/app/settings/server/index.js b/app/settings/server/index.js
new file mode 100644
index 000000000000..3adfad5409b3
--- /dev/null
+++ b/app/settings/server/index.js
@@ -0,0 +1,6 @@
+import { settings, SettingsEvents } from './functions/settings';
+
+export {
+	settings,
+	SettingsEvents,
+};
diff --git a/client/importPackages.ts b/client/importPackages.ts
index e5784c1d8070..54fe2ac78e28 100644
--- a/client/importPackages.ts
+++ b/client/importPackages.ts
@@ -63,7 +63,7 @@ import '../app/ui-login/client';
 import '../app/ui-master/client';
 import '../app/ui-message/client';
 import '../app/ui-sidenav/client';
-import '../app/ui-share';
+import '../app/ui-share/client';
 import '../app/ui-vrecord/client';
 import '../app/videobridge/client';
 import '../app/webdav/client';
diff --git a/client/importServiceWorker.js b/client/importServiceWorker.js
index 00f90a6d322f..7009191e0fdf 100644
--- a/client/importServiceWorker.js
+++ b/client/importServiceWorker.js
@@ -1,7 +1,7 @@
 import { Meteor } from 'meteor/meteor';
 import { Tracker } from 'meteor/tracker';
 
-import { settings } from '../app/settings';
+import { settings } from '../app/settings/client';
 import { modal } from '../app/ui-utils/client';
 import { handleError, t } from '../app/utils/client';
 
diff --git a/client/startup/notifications/updateUserDetailsForPushSubscription.js b/client/startup/notifications/updateUserDetailsForPushSubscription.js
index fd7962ccafe5..df38be54d814 100644
--- a/client/startup/notifications/updateUserDetailsForPushSubscription.js
+++ b/client/startup/notifications/updateUserDetailsForPushSubscription.js
@@ -1,6 +1,6 @@
 import { Meteor } from 'meteor/meteor';
 
-import { callbacks } from '../../../app/callbacks';
+import { callbacks } from '../../../app/callbacks/client';
 
 const removeUserIdOnLogout = () => {
 	if ('serviceWorker' in navigator) {
diff --git a/client/views/room/contextualBar/ExportMessages/MailExportForm.js b/client/views/room/contextualBar/ExportMessages/MailExportForm.js
index 621d817207cc..3c513176c8dc 100644
--- a/client/views/room/contextualBar/ExportMessages/MailExportForm.js
+++ b/client/views/room/contextualBar/ExportMessages/MailExportForm.js
@@ -12,7 +12,7 @@ import {
 import { useMutableCallback } from '@rocket.chat/fuselage-hooks';
 import React, { useState, useEffect } from 'react';
 
-import { offlineAction } from '../../../../../app/ui-utils';
+import { offlineAction } from '../../../../../app/ui-utils/client';
 import { roomTypes, isEmail } from '../../../../../app/utils/client';
 import UserAutoCompleteMultiple from '../../../../../ee/client/audit/UserAutoCompleteMultiple';
 import { useEndpoint } from '../../../../contexts/ServerContext';