From 7f373fbcf78bf84ebd1f2e5ddf4655398fc3e3ba Mon Sep 17 00:00:00 2001
From: Jack Kavanagh <jackkav@gmail.com>
Date: Thu, 24 Nov 2022 14:56:06 +0100
Subject: [PATCH] fix tab selection (#5462)

---
 .../src/ui/components/modals/settings-modal.tsx | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/packages/insomnia/src/ui/components/modals/settings-modal.tsx b/packages/insomnia/src/ui/components/modals/settings-modal.tsx
index c4366aea4e..56d7d98333 100644
--- a/packages/insomnia/src/ui/components/modals/settings-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/settings-modal.tsx
@@ -18,16 +18,16 @@ import { showModal } from './index';
 
 export interface SettingsModalHandle {
   hide: () => void;
-  show: (options?: { tab?: number }) => void;
+  show: (options?: { tab?: string }) => void;
 }
 
-export const TAB_INDEX_EXPORT = 1;
-export const TAB_INDEX_SHORTCUTS = 3;
-export const TAB_INDEX_THEMES = 2;
-export const TAB_INDEX_PLUGINS = 5;
+export const TAB_INDEX_EXPORT = 'data';
+export const TAB_INDEX_SHORTCUTS = 'keyboard';
+export const TAB_INDEX_THEMES = 'themes';
+export const TAB_INDEX_PLUGINS = 'plugins';
 export const SettingsModal = forwardRef<SettingsModalHandle, ModalProps>((props, ref) => {
   const settings = useSelector(selectSettings);
-  const [, setCurrentTabIndex] = useState<number | null>(null);
+  const [defaultTabKey, setDefaultTabKey] = useState('general');
   const modalRef = useRef<ModalHandle>(null);
   const email = session.isLoggedIn() ? session.getFullName() : null;
 
@@ -36,8 +36,7 @@ export const SettingsModal = forwardRef<SettingsModalHandle, ModalProps>((props,
       modalRef.current?.hide();
     },
     show: options => {
-      const tabIndex = typeof options?.tab !== 'number' ? 0 : options.tab;
-      setCurrentTabIndex(tabIndex);
+      setDefaultTabKey(options?.tab || 'general');
       modalRef.current?.show();
     },
   }), []);
@@ -52,7 +51,7 @@ export const SettingsModal = forwardRef<SettingsModalHandle, ModalProps>((props,
         </span>
       </ModalHeader>
       <ModalBody noScroll>
-        <Tabs aria-label="Insomnia Settings">
+        <Tabs aria-label="Insomnia Settings"  defaultSelectedKey={defaultTabKey}>
           <TabItem key="general" title="General">
             <PanelContainer className="pad">
               <General />