Merge pull request #202 from nada-deriv/nada/folder-restructure

Nada/fix: restructure the folders for consistency

Author: farrah-deriv

src/components/AppHeader/AccountSwitcher/index.tsx src/components/AppHeader/AccountSwitcher/AccountSwitcher.tsx

@@ -8,7 +8,7 @@ type TAccountSwitcherProps = {
     account: TActiveAccount;
 };
 
-export const AccountSwitcher = ({ account }: TAccountSwitcherProps) => {
+const AccountSwitcher = ({ account }: TAccountSwitcherProps) => {
     const activeAccount = {
         balance: FormatUtils.formatMoney(account?.balance ?? 0),
         currency: account?.currency || 'USD',
@@ -20,3 +20,5 @@ export const AccountSwitcher = ({ account }: TAccountSwitcherProps) => {
     };
     return account && <UIAccountSwitcher activeAccount={activeAccount} buttonClassName='mr-4' isDisabled />;
 };
+
+export default AccountSwitcher;

src/components/AppHeader/AccountSwitcher/index.ts

@@ -0,0 +1 @@
+export { default as AccountSwitcher } from './AccountSwitcher';

src/components/AppHeader/SkeletonLoader/index.tsx src/components/AppHeader/AccountsInfoLoader/AccountsInfoLoader.tsx

@@ -27,7 +27,7 @@ const LoggedInPreloader = ({ isMobile }: Pick<TAccountsInfoLoaderProps, 'isMobil
     </>
 );
 
-export const AccountsInfoLoader = ({ isMobile, speed }: TAccountsInfoLoaderProps) => (
+const AccountsInfoLoader = ({ isMobile, speed }: TAccountsInfoLoaderProps) => (
     <ContentLoader
         backgroundColor={'#f2f3f4'}
         data-testid='dt_accounts_info_loader'
@@ -39,3 +39,5 @@ export const AccountsInfoLoader = ({ isMobile, speed }: TAccountsInfoLoaderProps
         <LoggedInPreloader isMobile={isMobile} />
     </ContentLoader>
 );
+
+export default AccountsInfoLoader;

src/components/AppHeader/AccountsInfoLoader/index.ts

@@ -0,0 +1 @@
+export { default as AccountsInfoLoader } from './AccountsInfoLoader';

src/components/AppHeader/AppHeader.tsx

@@ -6,13 +6,13 @@ import { useAuthData } from '@deriv-com/api-hooks';
 import { useTranslations } from '@deriv-com/translations';
 import { Button, Header, Text, useDevice, Wrapper } from '@deriv-com/ui';
 import { TooltipMenuIcon } from '../TooltipMenuIcon';
+import { AccountsInfoLoader } from './AccountsInfoLoader';
 import { AccountSwitcher } from './AccountSwitcher';
 import { AppLogo } from './AppLogo';
 import { MenuItems } from './MenuItems';
 import { MobileMenu } from './MobileMenu';
 import { Notifications } from './Notifications';
 import { PlatformSwitcher } from './PlatformSwitcher';
-import { AccountsInfoLoader } from './SkeletonLoader';
 import './AppHeader.scss';
 
 // TODO: handle local storage values not updating after changing local storage values

src/components/AppHeader/AppLogo/index.tsx src/components/AppHeader/AppLogo/AppLogo.tsx

@@ -2,7 +2,7 @@ import { DerivLogo, useDevice } from '@deriv-com/ui';
 import { URLConstants } from '@deriv-com/utils';
 import './AppLogo.scss';
 
-export const AppLogo = () => {
+const AppLogo = () => {
     const { isDesktop } = useDevice();
 
     if (!isDesktop) return null;
@@ -15,3 +15,5 @@ export const AppLogo = () => {
         />
     );
 };
+
+export default AppLogo;

src/components/AppHeader/AppLogo/index.ts

@@ -0,0 +1 @@
+export { default as AppLogo } from './AppLogo';

src/components/AppHeader/MenuItems/index.tsx src/components/AppHeader/MenuItems/MenuItems.tsx

@@ -3,7 +3,7 @@ import { MenuItem, Text, useDevice } from '@deriv-com/ui';
 import { MenuItems as items } from '../HeaderConfig';
 import './MenuItems.scss';
 
-export const MenuItems = () => {
+const MenuItems = () => {
     const { localize } = useTranslations();
     const { isDesktop } = useDevice();
 
@@ -29,3 +29,5 @@ export const MenuItems = () => {
         </>
     );
 };
+
+export default MenuItems;

src/components/AppHeader/MenuItems/index.ts

@@ -0,0 +1 @@
+export { default as MenuItems } from './MenuItems';

src/components/AppHeader/Notifications/index.tsx src/components/AppHeader/Notifications/Notifications.tsx

@@ -4,7 +4,7 @@ import { LegacyNotificationIcon } from '@deriv/quill-icons';
 import { useTranslations } from '@deriv-com/translations';
 import { Notifications as UINotifications, useDevice } from '@deriv-com/ui';
 
-export const Notifications = () => {
+const Notifications = () => {
     const [isOpen, setIsOpen] = useState(false);
     const { localize } = useTranslations();
     const { isMobile } = useDevice();
@@ -21,7 +21,7 @@ export const Notifications = () => {
                 <LegacyNotificationIcon fill='red' iconSize='sm' />
             </TooltipMenuIcon>
             <UINotifications
-                className={isMobile ? '' : 'notifications__wrapper absolute top-20 right-80 z-10'}
+                className={isMobile ? '' : 'absolute top-20 right-80 z-10'}
                 clearNotificationsCallback={() => {}}
                 componentConfig={{
                     clearButtonText: localize('Clear all'),
@@ -36,3 +36,5 @@ export const Notifications = () => {
         </>
     );
 };
+
+export default Notifications;

src/components/AppHeader/Notifications/index.ts

@@ -0,0 +1 @@
+export { default as Notifications } from './Notifications';

src/components/AppHeader/PlatformSwitcher/index.tsx src/components/AppHeader/PlatformSwitcher/PlatformSwitcher.tsx

@@ -2,7 +2,7 @@ import { useTranslations } from '@deriv-com/translations';
 import { PlatformSwitcher as UIPlatformSwitcher, PlatformSwitcherItem } from '@deriv-com/ui';
 import { platformsConfig } from '../HeaderConfig';
 
-export const PlatformSwitcher = () => {
+const PlatformSwitcher = () => {
     const { localize } = useTranslations();
 
     return (
@@ -28,3 +28,5 @@ export const PlatformSwitcher = () => {
         </UIPlatformSwitcher>
     );
 };
+
+export default PlatformSwitcher;

src/components/AppHeader/PlatformSwitcher/index.ts

@@ -0,0 +1 @@
+export { default as PlatformSwitcher } from './PlatformSwitcher';