From 5327e37318e2273b4f1df5cbc68f5065cfa6bd98 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Sat, 13 Jul 2024 14:41:25 +0200
Subject: [PATCH] rename button

---
 libs/remix-ui/git/src/components/disabled.tsx |   2 +-
 libs/remix-ui/git/src/components/gitui.tsx    | 122 ++---
 .../git/src/components/panels/version.tsx     |  12 +-
 libs/remix-ui/git/src/state/gitreducer.tsx    | 417 +++++++++---------
 4 files changed, 276 insertions(+), 277 deletions(-)

diff --git a/libs/remix-ui/git/src/components/disabled.tsx b/libs/remix-ui/git/src/components/disabled.tsx
index fc22116a36..1f03413be9 100644
--- a/libs/remix-ui/git/src/components/disabled.tsx
+++ b/libs/remix-ui/git/src/components/disabled.tsx
@@ -19,7 +19,7 @@ export const Disabled = () => {
     (platform === appPlatformTypes.desktop) ?
       <div className='p-1'>
         <div><FormattedMessage id="gitui.openFolderMessage"/></div>
-        <div data-id="openFolderButton" onClick={async () => { await openFolderElectron(null) }} className='btn btn-primary w-100 my-1'><FormattedMessage id="electron.openFolder" /></div>
+        <div data-id="openFolderButtonInDisabled" onClick={async () => { await openFolderElectron(null) }} className='btn btn-primary w-100 my-1'><FormattedMessage id="electron.openFolder" /></div>
         <div data-id="cloneButton" onClick={async () => { await clone() }} className='btn btn-primary w-100'><FormattedMessage id="electron.gitClone" /></div>
       </div>
       :
diff --git a/libs/remix-ui/git/src/components/gitui.tsx b/libs/remix-ui/git/src/components/gitui.tsx
index dd26b41e8e..9a4289b1d5 100644
--- a/libs/remix-ui/git/src/components/gitui.tsx
+++ b/libs/remix-ui/git/src/components/gitui.tsx
@@ -181,67 +181,67 @@ export const GitUI = (props: IGitUi) => {
                 {needsInit ? <Init></Init> : null}
                 {!setup && !needsInit ?
                   <>
-                  <Accordion activeKey={activePanel} defaultActiveKey="0">
-                    <SourceControlNavigation eventKey="0" activePanel={activePanel} callback={setActivePanel} />
-
-                    <Accordion.Collapse className='bg-light' eventKey="0">
-                      <>
-                        <SourceControlBase><CommitMessage /></SourceControlBase>
-                        <SourceControl />
-                      </>
-                    </Accordion.Collapse>
-                    <hr></hr>
-                    <CommandsNavigation eventKey="1" activePanel={activePanel} callback={setActivePanel} />
-                    <Accordion.Collapse className='bg-light' eventKey="1">
-                      <>
-                        <Commands></Commands>
-                      </>
-                    </Accordion.Collapse>
-                    <hr></hr>
-                    <CommitsNavigation title={`COMMITS`} eventKey="3" activePanel={activePanel} callback={setActivePanel} showButtons={true} />
-                    <Accordion.Collapse className='bg-light' eventKey="3">
-                      <>
-                        <Commits />
-                      </>
-                    </Accordion.Collapse>
-                    <hr></hr>
-                    <BranchesNavigation eventKey="2" activePanel={activePanel} callback={setActivePanel} />
-                    <Accordion.Collapse className='bg-light' eventKey="2">
-                      <>
-                        <Branches /></>
-                    </Accordion.Collapse>
-                    <hr></hr>
-                    <RemotesNavigation eventKey="5" activePanel={activePanel} callback={setActivePanel} />
-                    <Accordion.Collapse className='bg-light' eventKey="5">
-                      <>
-                        <Remotes></Remotes>
-                      </>
-                    </Accordion.Collapse>
-                    <hr></hr>
-                    <CloneNavigation eventKey="4" activePanel={activePanel} callback={setActivePanel} />
-                    <Accordion.Collapse className='bg-light' eventKey="4">
-                      <>
-                        <Clone /></>
-                    </Accordion.Collapse>
-                    <hr></hr>
-                    <GitHubNavigation eventKey="7" activePanel={activePanel} callback={setActivePanel} />
-                    <Accordion.Collapse className='bg-light' eventKey="7">
-                      <>
-                        <GetDeviceCode></GetDeviceCode>
-                        <hr></hr>
-                        <GitHubCredentials></GitHubCredentials>
-                      </>
-                    </Accordion.Collapse>
-                    <hr></hr>
-                    <LogNavigation eventKey="6" activePanel={activePanel} callback={setActivePanel} />
-                    <Accordion.Collapse className='bg-light' eventKey="6">
-                      <>
-                        <LogViewer />
-                      </>
-                    </Accordion.Collapse>
-
-                  </Accordion>
-                  <Version/></>
+                    <Accordion activeKey={activePanel} defaultActiveKey="0">
+                      <SourceControlNavigation eventKey="0" activePanel={activePanel} callback={setActivePanel} />
+
+                      <Accordion.Collapse className='bg-light' eventKey="0">
+                        <>
+                          <SourceControlBase><CommitMessage /></SourceControlBase>
+                          <SourceControl />
+                        </>
+                      </Accordion.Collapse>
+                      <hr></hr>
+                      <CommandsNavigation eventKey="1" activePanel={activePanel} callback={setActivePanel} />
+                      <Accordion.Collapse className='bg-light' eventKey="1">
+                        <>
+                          <Commands></Commands>
+                        </>
+                      </Accordion.Collapse>
+                      <hr></hr>
+                      <CommitsNavigation title={`COMMITS`} eventKey="3" activePanel={activePanel} callback={setActivePanel} showButtons={true} />
+                      <Accordion.Collapse className='bg-light' eventKey="3">
+                        <>
+                          <Commits />
+                        </>
+                      </Accordion.Collapse>
+                      <hr></hr>
+                      <BranchesNavigation eventKey="2" activePanel={activePanel} callback={setActivePanel} />
+                      <Accordion.Collapse className='bg-light' eventKey="2">
+                        <>
+                          <Branches /></>
+                      </Accordion.Collapse>
+                      <hr></hr>
+                      <RemotesNavigation eventKey="5" activePanel={activePanel} callback={setActivePanel} />
+                      <Accordion.Collapse className='bg-light' eventKey="5">
+                        <>
+                          <Remotes></Remotes>
+                        </>
+                      </Accordion.Collapse>
+                      <hr></hr>
+                      <CloneNavigation eventKey="4" activePanel={activePanel} callback={setActivePanel} />
+                      <Accordion.Collapse className='bg-light' eventKey="4">
+                        <>
+                          <Clone /></>
+                      </Accordion.Collapse>
+                      <hr></hr>
+                      <GitHubNavigation eventKey="7" activePanel={activePanel} callback={setActivePanel} />
+                      <Accordion.Collapse className='bg-light' eventKey="7">
+                        <>
+                          <GetDeviceCode></GetDeviceCode>
+                          <hr></hr>
+                          <GitHubCredentials></GitHubCredentials>
+                        </>
+                      </Accordion.Collapse>
+                      <hr></hr>
+                      <LogNavigation eventKey="6" activePanel={activePanel} callback={setActivePanel} />
+                      <Accordion.Collapse className='bg-light' eventKey="6">
+                        <>
+                          <LogViewer />
+                        </>
+                      </Accordion.Collapse>
+
+                    </Accordion>
+                    <Version/></>
                   : null}
               </pluginActionsContext.Provider>
             </gitActionsContext.Provider>
diff --git a/libs/remix-ui/git/src/components/panels/version.tsx b/libs/remix-ui/git/src/components/panels/version.tsx
index be8d1168d3..ccfef84ac9 100644
--- a/libs/remix-ui/git/src/components/panels/version.tsx
+++ b/libs/remix-ui/git/src/components/panels/version.tsx
@@ -1,10 +1,10 @@
 import React, { useEffect, useState } from 'react'
 import { gitPluginContext } from '../gitui'
 export const Version = () => {
-    const context = React.useContext(gitPluginContext)
-    return (
-        <div>
-            <p>{context.version.includes('version') ? context.version : `Git version: ${context.version}` }</p>
-        </div>
-    )
+  const context = React.useContext(gitPluginContext)
+  return (
+    <div>
+      <p>{context.version.includes('version') ? context.version : `Git version: ${context.version}` }</p>
+    </div>
+  )
 }
\ No newline at end of file
diff --git a/libs/remix-ui/git/src/state/gitreducer.tsx b/libs/remix-ui/git/src/state/gitreducer.tsx
index 2821f564c2..21c3e5f9b4 100644
--- a/libs/remix-ui/git/src/state/gitreducer.tsx
+++ b/libs/remix-ui/git/src/state/gitreducer.tsx
@@ -6,216 +6,215 @@ import { Actions } from "./actions"
 export const gitReducer = (state: gitState = defaultGitState, action: Actions): gitState => {
   switch (action.type) {
 
-    case 'FILE_STATUS':
-      return {
-        ...state,
-        fileStatusResult: action.payload,
-        staged: getFilesByStatus("staged", action.payload),
-        modified: getFilesByStatus("modified", action.payload),
-        untracked: getFilesByStatus("untracked", action.payload),
-        deleted: getFilesByStatus("deleted", action.payload),
-        allchangesnotstaged: allChangedButNotStagedFiles(action.payload)
-      }
-
-    case 'FILE_STATUS_MERGE':
-      action.payload.map((fileStatusResult: fileStatusResult) => {
-        const file = state.fileStatusResult.find(stateFile => {
-          return stateFile.filename === fileStatusResult.filename
-        })
-        if (file) {
-          file.status = fileStatusResult.status
-          file.statusNames = fileStatusResult.statusNames
-        }
-      })
-
-      return {
-        ...state,
-        staged: getFilesByStatus("staged", state.fileStatusResult),
-        modified: getFilesByStatus("modified", state.fileStatusResult),
-        untracked: getFilesByStatus("untracked", state.fileStatusResult),
-        deleted: getFilesByStatus("deleted", state.fileStatusResult),
-        allchangesnotstaged: allChangedButNotStagedFiles(state.fileStatusResult)
-      }
-
-    case 'SET_COMMITS':
-      return {
-        ...state,
-        commits: action.payload,
-        localCommitCount: action.payload.length
-      }
-
-    case 'SET_BRANCHES':
-      return {
-        ...state,
-        branches: action.payload
-      }
-
-    case 'SET_CURRENT_BRANCH':
-      return {
-        ...state,
-        currentBranch: action.payload
-      }
-
-    case 'SET_CURRENT_HEAD':
-      return {
-        ...state,
-        currentHead: action.payload
-      }
-
-    case 'SET_CAN_USE_APP':
-      return {
-        ...state,
-        canUseApp: action.payload
-      }
-    case 'SET_REPO_NAME':
-      return {
-        ...state,
-        reponame: action.payload
-      }
-    case 'SET_LOADING':
-      return {
-        ...state,
-        loading: action.payload
-      }
-
-    case 'SET_REPOS':
-      return {
-        ...state,
-        repositories: action.payload
-      }
-
-    case 'SET_REMOTE_BRANCHES':
-      return {
-        ...state,
-        remoteBranches: action.payload
-      }
-
-    case 'SET_CAN_COMMIT':
-      return {
-        ...state,
-        canCommit: action.payload
-      }
-
-    case 'SET_REMOTES':
-      return {
-        ...state,
-        remotes: action.payload
-      }
-
-    case 'SET_UPSTREAM':
-      return {
-        ...state,
-        upstream: action.payload
-      }
-
-    case 'SET_COMMIT_CHANGES':
-
-      action.payload.forEach((change: commitChange) => {
-        state.commitChanges.find((c) => c.hashModified === change.hashModified && c.hashOriginal === change.hashOriginal && c.path === change.path) ? null : state.commitChanges.push(change)
+  case 'FILE_STATUS':
+    return {
+      ...state,
+      fileStatusResult: action.payload,
+      staged: getFilesByStatus("staged", action.payload),
+      modified: getFilesByStatus("modified", action.payload),
+      untracked: getFilesByStatus("untracked", action.payload),
+      deleted: getFilesByStatus("deleted", action.payload),
+      allchangesnotstaged: allChangedButNotStagedFiles(action.payload)
+    }
+
+  case 'FILE_STATUS_MERGE':
+    action.payload.map((fileStatusResult: fileStatusResult) => {
+      const file = state.fileStatusResult.find(stateFile => {
+        return stateFile.filename === fileStatusResult.filename
       })
-
-      return {
-        ...state,
-        commitChanges: [...state.commitChanges]
-      }
-
-    case 'RESET_REMOTE_BRANCH_COMMITS':
-      if (state.remoteBranchCommits[action.payload.branch.name]) {
-        delete state.remoteBranchCommits[action.payload.branch.name]
-      }
-      return {
-        ...state,
-        remoteBranchCommits: { ...state.remoteBranchCommits }
-      }
-
-    case 'SET_REMOTE_BRANCH_COMMITS':
-      if (state.remoteBranchCommits[action.payload.branch.name]) {
-        state.remoteBranchCommits[action.payload.branch.name].push(...action.payload.commits)
-      } else {
-        state.remoteBranchCommits[action.payload.branch.name] = action.payload.commits
-      }
-      return {
-        ...state,
-        remoteBranchCommits: { ...state.remoteBranchCommits }
-      }
-
-    case 'SET_LOCAL_BRANCH_COMMITS':
-
-      state.localBranchCommits[action.payload.branch.name] = action.payload.commits
-      return {
-        ...state,
-        localBranchCommits: { ...state.localBranchCommits }
-      }
-
-    case 'SET_BRANCH_DIFFERENCES':
-
-      state.branchDifferences[`${action.payload.remote.name}/${action.payload.branch.name}`] = action.payload.branchDifference
-
-      return {
-        ...state,
-        branchDifferences: { ...state.branchDifferences }
-      }
-
-    case 'SET_GITHUB_USER':
-      return {
-        ...state,
-        gitHubUser: action.payload
-      }
-
-    case 'SET_GITHUB_ACCESS_TOKEN':
-      return {
-        ...state,
-        gitHubAccessToken: action.payload
-      }
-
-    case 'SET_SCOPES':
-      return {
-        ...state,
-        gitHubScopes: action.payload
-      }
-
-    case 'SET_USER_EMAILS':
-      return {
-        ...state,
-        userEmails: action.payload
-      }
-
-    case 'SET_DEFAULT_REMOTE':
-      return {
-        ...state,
-        defaultRemote: action.payload
-      }
-
-    case 'SET_LOG':
-      if (state.log.length > 0 && state.log[[...state.log].length - 1].message === action.payload.message) {
-        return {
-          ...state,
-          log: [...state.log]
-        }
-      }
-      return {
-        ...state,
-        log: [...state.log, action.payload]
-      }
-
-    case 'CLEAR_LOG':
-      return {
-        ...state,
-        log: []
-      }
-
-    case 'DESKTOP_SET_WORKING_DIR':
-      return {
-        ...state,
-        desktopWorkingDir: action.payload
-      }
-
-
-    case 'SET_VERSION':
-      return {
-        ...state,
-        version: action.payload
-      }
+      if (file) {
+        file.status = fileStatusResult.status
+        file.statusNames = fileStatusResult.statusNames
+      }
+    })
+
+    return {
+      ...state,
+      staged: getFilesByStatus("staged", state.fileStatusResult),
+      modified: getFilesByStatus("modified", state.fileStatusResult),
+      untracked: getFilesByStatus("untracked", state.fileStatusResult),
+      deleted: getFilesByStatus("deleted", state.fileStatusResult),
+      allchangesnotstaged: allChangedButNotStagedFiles(state.fileStatusResult)
+    }
+
+  case 'SET_COMMITS':
+    return {
+      ...state,
+      commits: action.payload,
+      localCommitCount: action.payload.length
+    }
+
+  case 'SET_BRANCHES':
+    return {
+      ...state,
+      branches: action.payload
+    }
+
+  case 'SET_CURRENT_BRANCH':
+    return {
+      ...state,
+      currentBranch: action.payload
+    }
+
+  case 'SET_CURRENT_HEAD':
+    return {
+      ...state,
+      currentHead: action.payload
+    }
+
+  case 'SET_CAN_USE_APP':
+    return {
+      ...state,
+      canUseApp: action.payload
+    }
+  case 'SET_REPO_NAME':
+    return {
+      ...state,
+      reponame: action.payload
+    }
+  case 'SET_LOADING':
+    return {
+      ...state,
+      loading: action.payload
+    }
+
+  case 'SET_REPOS':
+    return {
+      ...state,
+      repositories: action.payload
+    }
+
+  case 'SET_REMOTE_BRANCHES':
+    return {
+      ...state,
+      remoteBranches: action.payload
+    }
+
+  case 'SET_CAN_COMMIT':
+    return {
+      ...state,
+      canCommit: action.payload
+    }
+
+  case 'SET_REMOTES':
+    return {
+      ...state,
+      remotes: action.payload
+    }
+
+  case 'SET_UPSTREAM':
+    return {
+      ...state,
+      upstream: action.payload
+    }
+
+  case 'SET_COMMIT_CHANGES':
+
+    action.payload.forEach((change: commitChange) => {
+      state.commitChanges.find((c) => c.hashModified === change.hashModified && c.hashOriginal === change.hashOriginal && c.path === change.path) ? null : state.commitChanges.push(change)
+    })
+
+    return {
+      ...state,
+      commitChanges: [...state.commitChanges]
+    }
+
+  case 'RESET_REMOTE_BRANCH_COMMITS':
+    if (state.remoteBranchCommits[action.payload.branch.name]) {
+      delete state.remoteBranchCommits[action.payload.branch.name]
+    }
+    return {
+      ...state,
+      remoteBranchCommits: { ...state.remoteBranchCommits }
+    }
+
+  case 'SET_REMOTE_BRANCH_COMMITS':
+    if (state.remoteBranchCommits[action.payload.branch.name]) {
+      state.remoteBranchCommits[action.payload.branch.name].push(...action.payload.commits)
+    } else {
+      state.remoteBranchCommits[action.payload.branch.name] = action.payload.commits
+    }
+    return {
+      ...state,
+      remoteBranchCommits: { ...state.remoteBranchCommits }
+    }
+
+  case 'SET_LOCAL_BRANCH_COMMITS':
+
+    state.localBranchCommits[action.payload.branch.name] = action.payload.commits
+    return {
+      ...state,
+      localBranchCommits: { ...state.localBranchCommits }
+    }
+
+  case 'SET_BRANCH_DIFFERENCES':
+
+    state.branchDifferences[`${action.payload.remote.name}/${action.payload.branch.name}`] = action.payload.branchDifference
+
+    return {
+      ...state,
+      branchDifferences: { ...state.branchDifferences }
+    }
+
+  case 'SET_GITHUB_USER':
+    return {
+      ...state,
+      gitHubUser: action.payload
+    }
+
+  case 'SET_GITHUB_ACCESS_TOKEN':
+    return {
+      ...state,
+      gitHubAccessToken: action.payload
+    }
+
+  case 'SET_SCOPES':
+    return {
+      ...state,
+      gitHubScopes: action.payload
+    }
+
+  case 'SET_USER_EMAILS':
+    return {
+      ...state,
+      userEmails: action.payload
+    }
+
+  case 'SET_DEFAULT_REMOTE':
+    return {
+      ...state,
+      defaultRemote: action.payload
+    }
+
+  case 'SET_LOG':
+    if (state.log.length > 0 && state.log[[...state.log].length - 1].message === action.payload.message) {
+      return {
+        ...state,
+        log: [...state.log]
+      }
+    }
+    return {
+      ...state,
+      log: [...state.log, action.payload]
+    }
+
+  case 'CLEAR_LOG':
+    return {
+      ...state,
+      log: []
+    }
+
+  case 'DESKTOP_SET_WORKING_DIR':
+    return {
+      ...state,
+      desktopWorkingDir: action.payload
+    }
+
+  case 'SET_VERSION':
+    return {
+      ...state,
+      version: action.payload
+    }
 
   }
 }
\ No newline at end of file