From b94dd9e8f28d67005aacfea4b05e6266e9843ac8 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Wed, 21 Aug 2024 14:05:09 +0200
Subject: [PATCH] fix test

---
 apps/remix-ide-e2e/src/tests/dgit_github.test.ts   | 5 ++---
 apps/remix-ide-e2e/src/tests/dgit_local.test.ts    | 5 ++---
 apps/remix-ide-e2e/src/tests/workspace_git.test.ts | 5 ++---
 libs/remix-ui/git/src/components/gitui.tsx         | 4 ++--
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/apps/remix-ide-e2e/src/tests/dgit_github.test.ts b/apps/remix-ide-e2e/src/tests/dgit_github.test.ts
index 445bae9231..da38485359 100644
--- a/apps/remix-ide-e2e/src/tests/dgit_github.test.ts
+++ b/apps/remix-ide-e2e/src/tests/dgit_github.test.ts
@@ -16,9 +16,8 @@ module.exports = {
     'Update settings for git #group1 #group2': function (browser: NightwatchBrowser) {
         browser.
             clickLaunchIcon('dgit')
-            // .waitForElementVisible('*[data-id="initgit-btn"]')
-            // .click('*[data-id="initgit-btn"]')
-            .waitForElementVisible('*[data-id="githubToken"]')
+            .waitForElementVisible('*[data-id="initgit-btn"]')
+            .click('*[data-id="initgit-btn"]')
             .setValue('*[data-id="githubToken"]', process.env.dgit_token)
             .setValue('*[data-id="gitubUsername"]', 'git')
             .setValue('*[data-id="githubEmail"]', 'git@example.com')
diff --git a/apps/remix-ide-e2e/src/tests/dgit_local.test.ts b/apps/remix-ide-e2e/src/tests/dgit_local.test.ts
index 9e79bf3920..fc0ec93f98 100644
--- a/apps/remix-ide-e2e/src/tests/dgit_local.test.ts
+++ b/apps/remix-ide-e2e/src/tests/dgit_local.test.ts
@@ -34,9 +34,8 @@ module.exports = {
     'Update settings for git #group1 #group2 #group3 #group4': function (browser: NightwatchBrowser) {
         browser.
             clickLaunchIcon('dgit')
-            // .waitForElementVisible('*[data-id="initgit-btn"]')
-            // .click('*[data-id="initgit-btn"]')
-            .waitForElementVisible('*[data-id="gitubUsername"]')
+            .waitForElementVisible('*[data-id="initgit-btn"]')
+            .click('*[data-id="initgit-btn"]')
             .setValue('*[data-id="gitubUsername"]', 'git')
             .setValue('*[data-id="githubEmail"]', 'git@example.com')
             .click('*[data-id="saveGitHubCredentials"]')
diff --git a/apps/remix-ide-e2e/src/tests/workspace_git.test.ts b/apps/remix-ide-e2e/src/tests/workspace_git.test.ts
index c25da43ef7..0661eb31ee 100644
--- a/apps/remix-ide-e2e/src/tests/workspace_git.test.ts
+++ b/apps/remix-ide-e2e/src/tests/workspace_git.test.ts
@@ -421,9 +421,8 @@ module.exports = {
   'Update settings for git #group5': function (browser: NightwatchBrowser) {
     browser.
       clickLaunchIcon('dgit')
-      // .waitForElementVisible('*[data-id="initgit-btn"]')
-      // .click('*[data-id="initgit-btn"]')
-      .waitForElementVisible('*[data-id="gitubUsername"]')
+      .waitForElementVisible('*[data-id="initgit-btn"]')
+      .click('*[data-id="initgit-btn"]')
       .setValue('*[data-id="gitubUsername"]', 'git')
       .setValue('*[data-id="githubEmail"]', 'git@example.com')
       .click('*[data-id="saveGitHubCredentials"]')
diff --git a/libs/remix-ui/git/src/components/gitui.tsx b/libs/remix-ui/git/src/components/gitui.tsx
index 11462b01ec..6ee3808f71 100644
--- a/libs/remix-ui/git/src/components/gitui.tsx
+++ b/libs/remix-ui/git/src/components/gitui.tsx
@@ -174,8 +174,8 @@ export const GitUI = (props: IGitUi) => {
               <pluginActionsContext.Provider value={pluginActionsProviderValue}>
                 <BranchHeader />
 
-                {setup ? <Setup></Setup> : null}
-                {!setup && needsInit ? <Init></Init> : null}
+                {setup && !needsInit ? <Setup></Setup> : null}
+                {needsInit ? <Init></Init> : null}
                 {!setup && !needsInit ?
                   <Accordion activeKey={activePanel} defaultActiveKey="0" className="">
                     <GitHubNavigation eventKey={gitUIPanels.GITHUB} activePanel={activePanel} callback={setActivePanel} />