From d016daf6ccd16a1cb55da17c8e943a9d23303c1b Mon Sep 17 00:00:00 2001
From: Joseph Izang <josephizang@gmail.com>
Date: Tue, 2 Jul 2024 12:08:51 +0100
Subject: [PATCH] relocate the git fetch button. format code.

---
 .../git/src/components/github/repositoryselect.tsx        | 2 +-
 .../src/components/github/selectandclonerepositories.tsx  | 8 ++++----
 libs/remix-ui/git/src/components/panels/clone.tsx         | 4 ++--
 libs/remix-ui/git/src/components/panels/tokenWarning.tsx  | 6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libs/remix-ui/git/src/components/github/repositoryselect.tsx b/libs/remix-ui/git/src/components/github/repositoryselect.tsx
index dab826beb9..212ce295dd 100644
--- a/libs/remix-ui/git/src/components/github/repositoryselect.tsx
+++ b/libs/remix-ui/git/src/components/github/repositoryselect.tsx
@@ -64,7 +64,7 @@ const RepositorySelect = (props: RepositorySelectProps) => {
   };
 
   return (
-    <><button data-id='fetch-repositories' onClick={fetchRepositories} className="w-100 mt-1 btn btn-secondary">
+    <><button data-id='fetch-repositories' onClick={fetchRepositories} className="w-100 mt-1 btn btn-secondary mb-2">
       <i className="fab fa-github mr-1"></i>Fetch Repositories from GitHub
     </button>
     {
diff --git a/libs/remix-ui/git/src/components/github/selectandclonerepositories.tsx b/libs/remix-ui/git/src/components/github/selectandclonerepositories.tsx
index 54054605a8..d62b761118 100644
--- a/libs/remix-ui/git/src/components/github/selectandclonerepositories.tsx
+++ b/libs/remix-ui/git/src/components/github/selectandclonerepositories.tsx
@@ -44,15 +44,15 @@ export const SelectAndCloneRepositories = (props: RepositoriesProps) => {
 
   return (
     <>
-      <TokenWarning plugin={props.plugin} />
       <RepositorySelect select={selectRepo} />
+      <TokenWarning plugin={props.plugin} />
 
-      {repo &&<BranchSelect select={selectRemoteBranch} />}
+      { repo && <BranchSelect select={selectRemoteBranch} /> }
 
-      {repo && branch && branch.name && branch.name !== '0' ?
+      { repo && branch && branch.name && branch.name !== '0' ?
         <button data-id={`clonebtn-${repo.full_name}-${branch.name}`} className='btn btn-primary mt-1 w-100' onClick={async () => {
           await clone()
-        }}>clone {repo.full_name}:{branch.name}</button> : null}
+        }}>clone {repo.full_name}:{branch.name}</button> : null }
 
     </>
   )
diff --git a/libs/remix-ui/git/src/components/panels/clone.tsx b/libs/remix-ui/git/src/components/panels/clone.tsx
index 96d0388767..09e32e3e1d 100644
--- a/libs/remix-ui/git/src/components/panels/clone.tsx
+++ b/libs/remix-ui/git/src/components/panels/clone.tsx
@@ -68,6 +68,8 @@ export const Clone = ({ plugin }: CloneProps) => {
   return (
     <>
       <div data-id="clone-panel-content" className="px-3 py-2">
+        <SelectAndCloneRepositories cloneAllBranches={cloneAllBranches} cloneDepth={cloneDepth} plugin={plugin} />
+        <hr />
         <InputGroup className="mb-2 pb-1">
           <FormControl data-id="clone-url" id="cloneulr" placeholder="url" name='cloneurl' value={cloneUrl} onChange={e => onGitHubCloneUrlChange(e.target.value)} aria-describedby="urlprepend" />
         </InputGroup>
@@ -77,8 +79,6 @@ export const Clone = ({ plugin }: CloneProps) => {
           clone()
         }}>clone</GitUIButton>
         <hr />
-        <SelectAndCloneRepositories cloneAllBranches={cloneAllBranches} cloneDepth={cloneDepth} plugin={plugin} />
-        <hr />
         <label>Options</label>
         <InputGroup className="mt-1 mb-1">
           <InputGroup.Prepend className="bg-secondary">
diff --git a/libs/remix-ui/git/src/components/panels/tokenWarning.tsx b/libs/remix-ui/git/src/components/panels/tokenWarning.tsx
index 7b713ea26a..bce647758e 100644
--- a/libs/remix-ui/git/src/components/panels/tokenWarning.tsx
+++ b/libs/remix-ui/git/src/components/panels/tokenWarning.tsx
@@ -9,11 +9,11 @@ export const TokenWarning = (props: TokenWarningProps) => {
   const context = React.useContext(gitPluginContext)
   return (<>
     {(context.gitHubUser && context.gitHubUser.login) ? null :
-      <li className="text-warning list-group-item text-left">
-        <span>Generate and add a Git token to use this plugin. Tokens are found in </span><span className=" text-decoration-line-through messageTip" onClick={async () => {
+      <span className="text-warning text-left">
+        <span>Generate and add a Git token to use this plugin. Tokens are added in </span><span className=" text-decoration-line-through messageTip" onClick={async () => {
           await props.plugin.call('menuicons', 'select', 'settings')
         }}>settings</span><span> of the IDE.</span>
-      </li>
+      </span>
     }
   </>
   )