fix tests

libs/remix-ui/git/src/components/gitui.tsx

@@ -52,7 +52,7 @@ export const GitUI = (props: IGitUi) => {
     })
     setTimeout(() => {
       setAppLoaded(true)
-      plugin.on('filePanel', 'requestGitHubSignIn' as any, () => setActivePanel('0'))
+      plugin.on('filePanel', 'requestGitHubSignIn' as any, () => setActivePanel('7'))
     }, 2000)
   }, [])
 
@@ -178,15 +178,6 @@ export const GitUI = (props: IGitUi) => {
                 {needsInit ? <Init></Init> : null}
                 {!setup && !needsInit ?
                   <Accordion activeKey={activePanel} defaultActiveKey="0" className="">
-                    <GitHubNavigation eventKey={gitUIPanels.GITHUB} activePanel={activePanel} callback={setActivePanel} />
-                    <Accordion.Collapse className='bg-light' eventKey={gitUIPanels.GITHUB}>
-                      <div className="px-2 py-2">
-                        <GetDeviceCode></GetDeviceCode>
-                        <hr></hr>
-                        <GitHubCredentials></GitHubCredentials>
-                      </div>
-                    </Accordion.Collapse>
-                    <hr></hr>
                     <SourceControlNavigation eventKey={gitUIPanels.SOURCECONTROL} activePanel={activePanel} callback={setActivePanel} />
                     <Accordion.Collapse className='bg-light' eventKey={gitUIPanels.SOURCECONTROL}>
                       <div className="px-2 py-2">
@@ -229,6 +220,15 @@ export const GitUI = (props: IGitUi) => {
                         <Clone /></div>
                     </Accordion.Collapse>
                     <hr></hr>
+                    <GitHubNavigation eventKey={gitUIPanels.GITHUB} activePanel={activePanel} callback={setActivePanel} />
+                    <Accordion.Collapse className='bg-light' eventKey={gitUIPanels.GITHUB}>
+                      <div className="px-2 py-2">
+                        <GetDeviceCode></GetDeviceCode>
+                        <hr></hr>
+                        <GitHubCredentials></GitHubCredentials>
+                      </div>
+                    </Accordion.Collapse>
+                    <hr></hr>
                     <LogNavigation eventKey={gitUIPanels.LOG} activePanel={activePanel} callback={setActivePanel} />
                     <Accordion.Collapse className='bg-light' eventKey={gitUIPanels.LOG}>
                       <div className="px-2 py-2">

libs/remix-ui/git/src/types/index.ts

@@ -382,14 +382,14 @@ export enum gitMatomoEventTypes {
 }
 
 export enum gitUIPanels {
-    GITHUB = '0',
+    SOURCECONTROL = '0',
-    SOURCECONTROL = '1',
+    COMMANDS = '1',
-    COMMANDS = '2',
+    BRANCHES = '2',
-    BRANCHES = '3',
+    COMMITS = '3',
-    COMMITS = '4',
+    CLONE = '4',
-    CLONE = '5',
+    REMOTES = '5',
-    REMOTES = '6',
+    GITHUB = '7',
-    LOG = '7'
+    LOG = '6'
 }
 
 export interface fileStatusAction {