From c5741506cdbb9059910c911874f498719ded9e14 Mon Sep 17 00:00:00 2001
From: bunsenstraat <filip.mertens@ethereum.org>
Date: Thu, 18 Jul 2024 07:50:08 +0200
Subject: [PATCH] some fixes

---
 .../git/src/components/github/branchselect.tsx   |  2 +-
 .../git/src/components/github/devicecode.tsx     | 16 +++++++++-------
 .../github/selectandclonerepositories.tsx        |  2 +-
 .../git/src/components/panels/branches.tsx       | 10 ++++++++++
 .../remix-ui/git/src/components/panels/clone.tsx |  4 +++-
 .../src/components/panels/githubcredentials.tsx  | 13 +++++++------
 .../git/src/components/panels/remotes.tsx        | 14 ++++++++------
 .../git/src/components/panels/remoteselect.tsx   | 16 +++++++++++++---
 .../git/src/components/panels/remotesimport.tsx  |  4 ++--
 9 files changed, 54 insertions(+), 27 deletions(-)

diff --git a/libs/remix-ui/git/src/components/github/branchselect.tsx b/libs/remix-ui/git/src/components/github/branchselect.tsx
index e272f266f9..1e87e195e9 100644
--- a/libs/remix-ui/git/src/components/github/branchselect.tsx
+++ b/libs/remix-ui/git/src/components/github/branchselect.tsx
@@ -38,7 +38,7 @@ export const BranchSelect = (props: BranchySelectProps) => {
   return (<>{branchOptions && branchOptions.length ?
     <Select
       options={branchOptions}
-      className="mt-1"
+      className="mt-2"
       id="branch-select"
       onChange={(e: any) => selectRemoteBranch(e)}
       theme={selectTheme}
diff --git a/libs/remix-ui/git/src/components/github/devicecode.tsx b/libs/remix-ui/git/src/components/github/devicecode.tsx
index 396fa148a6..5ba492e8e4 100644
--- a/libs/remix-ui/git/src/components/github/devicecode.tsx
+++ b/libs/remix-ui/git/src/components/github/devicecode.tsx
@@ -108,14 +108,16 @@ export const GetDeviceCode = () => {
         (context.gitHubUser && context.gitHubUser.login) ?
           <div className="pt-2">
             <Card>
-              <Card.Body>
-                <Card.Title data-id={`connected-as-${context.gitHubUser.login}`}>Connected as {context.gitHubUser.login}</Card.Title>
+              <Card.Body className="p-2">
+              <div className="mb-1" data-id={`connected-as-${context.gitHubUser.login}`}>Connected as {context.gitHubUser.login}</div>
                 <Card.Text>
-                  <img data-id={`connected-img-${context.gitHubUser.login}`} src={context.gitHubUser.avatar_url} className="w-100" />
-                  <a data-id={`connected-link-${context.gitHubUser.login}`} href={context.gitHubUser.html_url}>{context.gitHubUser.html_url}</a>
-                  {context.userEmails && context.userEmails.filter((email: any) => email.primary).map((email: any) => {
-                    return <span key={email.email}><br></br>{email.email}</span>
-                  })}
+                  <img data-id={`connected-img-${context.gitHubUser.login}`} src={context.gitHubUser.avatar_url} className="w-25" />
+                  <br></br>
+                  
+                    <a data-id={`connected-link-${context.gitHubUser.login}`} href={context.gitHubUser.html_url}>{context.gitHubUser.html_url}</a>
+                    {context.userEmails && context.userEmails.filter((email: any) => email.primary).map((email: any) => {
+                      return <span key={email.email}><br></br>{email.email}</span>
+                    })}
                 </Card.Text>
               </Card.Body>
             </Card>
diff --git a/libs/remix-ui/git/src/components/github/selectandclonerepositories.tsx b/libs/remix-ui/git/src/components/github/selectandclonerepositories.tsx
index 80482958c1..0c85485f6e 100644
--- a/libs/remix-ui/git/src/components/github/selectandclonerepositories.tsx
+++ b/libs/remix-ui/git/src/components/github/selectandclonerepositories.tsx
@@ -43,7 +43,7 @@ export const SelectAndCloneRepositories = (props: RepositoriesProps) => {
 
   return (
     <>
-      <RepositorySelect title="Clone from GitHub" select={selectRepo} />
+      <RepositorySelect title="Load from GitHub" select={selectRepo} />
       <TokenWarning />
 
       { repo && <BranchSelect select={selectRemoteBranch} /> }
diff --git a/libs/remix-ui/git/src/components/panels/branches.tsx b/libs/remix-ui/git/src/components/panels/branches.tsx
index 0c70e1533f..8d3fe8ff93 100644
--- a/libs/remix-ui/git/src/components/panels/branches.tsx
+++ b/libs/remix-ui/git/src/components/panels/branches.tsx
@@ -21,12 +21,22 @@ export const Branches = () => {
       <div data-id='branches-panel-content' className="pt-2">
         {context.branches && context.branches.length ?
           <div>
+            <label className="text-uppercase">local branches</label>
             {context.branches && context.branches.filter((branch, index) => !branch.remote).map((branch, index) => {
               return (
                 <LocalBranchDetails key={index} branch={branch}></LocalBranchDetails>
               );
             })}
             <hr />
+            {context.upstream ?
+              <>
+                <label className="text-uppercase">remote branches on {context.upstream ? context.upstream.name : null}</label>
+                {context.branches && context.branches.filter((branch, index) => branch.remote && branch.remote.name === context.upstream.name ).map((branch, index) => {
+                  return (
+                    <RemoteBranchDetails key={index} branch={branch}></RemoteBranchDetails>
+                  );
+                })}
+                <hr /></> : null}
 
           </div> : null}
         {context.currentBranch
diff --git a/libs/remix-ui/git/src/components/panels/clone.tsx b/libs/remix-ui/git/src/components/panels/clone.tsx
index 2454cecf84..6a63948d52 100644
--- a/libs/remix-ui/git/src/components/panels/clone.tsx
+++ b/libs/remix-ui/git/src/components/panels/clone.tsx
@@ -64,9 +64,11 @@ export const Clone = () => {
   return (
     <>
       <div data-id="clone-panel-content">
+        <label className="text-uppercase">Clone from GitHub</label>
         <SelectAndCloneRepositories cloneAllBranches={cloneAllBranches} cloneDepth={cloneDepth} />
         <hr />
-        <InputGroup className="mb-2 pb-1">
+        <label className="text-uppercase">Clone from URL</label>
+        <InputGroup className="mb-2">
           <FormControl data-id="clone-url" id="cloneulr" placeholder="url" name='cloneurl' value={cloneUrl} onChange={e => onGitHubCloneUrlChange(e.target.value)} aria-describedby="urlprepend" />
         </InputGroup>
 
diff --git a/libs/remix-ui/git/src/components/panels/githubcredentials.tsx b/libs/remix-ui/git/src/components/panels/githubcredentials.tsx
index 607e86f5dc..7e92bba35b 100644
--- a/libs/remix-ui/git/src/components/panels/githubcredentials.tsx
+++ b/libs/remix-ui/git/src/components/panels/githubcredentials.tsx
@@ -19,7 +19,7 @@ export const GitHubCredentials = () => {
 
   useEffect(() => {
     refresh()
-    if (context.gitHubUser){
+    if (context.gitHubUser) {
       setScopeWarning(!(context.gitHubScopes && context.gitHubScopes.length > 0))
     } else {
       setScopeWarning(false)
@@ -67,14 +67,15 @@ export const GitHubCredentials = () => {
 
   return (
     <>
+      <label className="text-uppercase">Enter GitHub credentials manually</label>
       <div className="input-group text-secondary mb-3 h6">
-        <input data-id='githubToken' type="password" value={githubToken} placeholder="GitHub token" className="form-control" name='githubToken' onChange={e => handleChangeTokenState(e.target.value)} />
+        <input data-id='githubToken' type="password" autoComplete="off" value={githubToken} placeholder="GitHub token" className="form-control" name='githubToken' onChange={e => handleChangeTokenState(e.target.value)} />
         <div className="input-group-append">
           <CopyToClipboard content={githubToken} data-id='copyToClipboardCopyIcon' className='far fa-copy ml-1 p-2 mt-1' direction={"top"} />
         </div>
       </div>
-      <input data-id='gitubUsername' name='githubUsername' onChange={e => handleChangeUserNameState(e.target.value)} value={githubUsername} className="form-control mb-3" placeholder="Git username" type="text" id="githubUsername" />
-      <input data-id='githubEmail' name='githubEmail' onChange={e => handleChangeEmailState(e.target.value)} value={githubEmail} className="form-control mb-3" placeholder="Git email" type="text" id="githubEmail" />
+      <input data-id='gitubUsername' name='githubUsername' onChange={e => handleChangeUserNameState(e.target.value)} value={githubUsername} className="form-control mb-3" placeholder="* Git username" type="text" id="githubUsername" />
+      <input data-id='githubEmail' name='githubEmail' onChange={e => handleChangeEmailState(e.target.value)} value={githubEmail} className="form-control mb-3" placeholder="* Git email" type="text" id="githubEmail" />
       <div className="d-flex justify-content-between">
         <button data-id='saveGitHubCredentials' className="btn btn-primary w-100" onClick={saveGithubToken}>
           <FormattedMessage id="save" defaultMessage="Save" />
@@ -82,8 +83,8 @@ export const GitHubCredentials = () => {
         <button className="btn btn-danger far fa-trash-alt" onClick={removeToken}>
         </button>
       </div>
-      {scopeWarning?
-        <div className="text-warning">Your GitHub token may not have the correct permissions. Please use the login with GitHub feature.</div>:null}
+      {scopeWarning ?
+        <div className="text-warning">Your GitHub token may not have the correct permissions. Please use the login with GitHub feature.</div> : null}
       <hr />
     </>
   );
diff --git a/libs/remix-ui/git/src/components/panels/remotes.tsx b/libs/remix-ui/git/src/components/panels/remotes.tsx
index 04b41436f2..59cc824a17 100644
--- a/libs/remix-ui/git/src/components/panels/remotes.tsx
+++ b/libs/remix-ui/git/src/components/panels/remotes.tsx
@@ -27,23 +27,25 @@ export const Remotes = () => {
   return (
     <>
       <div data-id="remotes-panel-content" className="d-flex flex-column">
-        <RemotesImport />
-        <hr className="mt-0 border border-2" />
         {context.remotes && context.remotes.length ?
           <div>
 
             {context.remotes && context.remotes.map((remote, index) => {
 
               return (
-                <Remoteselect key={index} remote={remote}></Remoteselect>
+                <Remoteselect key={index} openDefault={index===0} remote={remote}></Remoteselect>
               );
             })}
           </div> : <div>
             <label className="text-uppercase">No remotes</label>
           </div>}
-
-        <input placeholder="remote name" name='remotename' onChange={e => onRemoteNameChange(e.target.value)} value={remoteName} className="form-control mb-3" type="text" id="remotename" />
-        <input placeholder="remote url" name='remoteurl' onChange={e => onUrlChange(e.target.value)} value={url} className="form-control mb-3" type="text" id="remoteurl" />
+        <hr></hr>
+        <label className="text-uppercase">Add remote from GitHub</label>
+        <RemotesImport />
+        <hr></hr>
+        <label className="text-uppercase">Add remote manually</label>
+        <input placeholder="remote name" name='remotename' onChange={e => onRemoteNameChange(e.target.value)} value={remoteName} className="form-control mb-2" type="text" id="remotename" />
+        <input placeholder="remote url" name='remoteurl' onChange={e => onUrlChange(e.target.value)} value={url} className="form-control mb-2" type="text" id="remoteurl" />
 
         <button disabled={(remoteName && url) ? false : true} className='btn btn-primary mt-1 w-100' onClick={async () => {
           addRemote();
diff --git a/libs/remix-ui/git/src/components/panels/remoteselect.tsx b/libs/remix-ui/git/src/components/panels/remoteselect.tsx
index f2eedadfb3..1752c72c03 100644
--- a/libs/remix-ui/git/src/components/panels/remoteselect.tsx
+++ b/libs/remix-ui/git/src/components/panels/remoteselect.tsx
@@ -7,9 +7,13 @@ import { RemotesDetailsNavigation } from "../navigation/remotesdetails";
 import { Accordion } from "react-bootstrap";
 import { remote } from "../../types";
 import { RemoteBranchDetails } from "./branches/remotebranchedetails";
+import GitUIButton from "../buttons/gituibutton";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import { faSync } from "@fortawesome/free-solid-svg-icons";
 
 export interface RemoteSelectProps {
   remote: remote
+  openDefault: boolean
 }
 
 export const Remoteselect = (props: RemoteSelectProps) => {
@@ -20,15 +24,21 @@ export const Remoteselect = (props: RemoteSelectProps) => {
 
   return (
     <>
-      <Accordion activeKey={activePanel} defaultActiveKey="">
+      <Accordion activeKey={activePanel ? activePanel : props.openDefault ? '0' : ''} defaultActiveKey=''>
         <RemotesDetailsNavigation callback={setActivePanel} eventKey="0" activePanel={activePanel} remote={remote} />
         <Accordion.Collapse className="pl-2 border-left ml-1" eventKey="0">
           <>
-            {context.branches && context.branches.filter((branch, index) => branch.remote && branch.remote.name === remote.name ).map((branch, index) => {
+            {context.branches && context.branches.filter((branch, index) => branch.remote && branch.remote.name === remote.name).map((branch, index) => {
               return (
                 <RemoteBranchDetails key={index} branch={branch}></RemoteBranchDetails>
               );
-            })}</>
+            })}
+            <GitUIButton data-id={`remote-sync-${remote.name}`} className="btn btn-sm" onClick={async () => {
+              await actions.fetch({
+                remote
+              })
+            }}><FontAwesomeIcon icon={faSync} ></FontAwesomeIcon><label className="pl-1">Fetch more from remote</label></GitUIButton>
+          </>
 
         </Accordion.Collapse>
       </Accordion>
diff --git a/libs/remix-ui/git/src/components/panels/remotesimport.tsx b/libs/remix-ui/git/src/components/panels/remotesimport.tsx
index 5297ab00fa..28c4c48325 100644
--- a/libs/remix-ui/git/src/components/panels/remotesimport.tsx
+++ b/libs/remix-ui/git/src/components/panels/remotesimport.tsx
@@ -64,10 +64,10 @@ export const RemotesImport = () => {
 
   return (
     <>
-      <RepositorySelect title="Add from GitHub" select={selectRepo} />
+      <RepositorySelect title="Load from GitHub" select={selectRepo} />
       <TokenWarning />
       {repo ?
-        <input data-id='remote-panel-remotename' placeholder="remote name" name='remotename' onChange={e => onRemoteNameChange(e.target.value)} value={remoteName} className="form-control mb-2" type="text" id="remotename" />
+        <input data-id='remote-panel-remotename' placeholder="remote name" name='remotename' onChange={e => onRemoteNameChange(e.target.value)} value={remoteName} className="form-control mb-2 mt-2" type="text" id="remotename" />
         : null}
 
       {repo && remoteName ?