diff --git a/apps/remix-ide/src/app.js b/apps/remix-ide/src/app.js
index a7b0b5adc4..2dafcd7efe 100644
--- a/apps/remix-ide/src/app.js
+++ b/apps/remix-ide/src/app.js
@@ -509,7 +509,7 @@ class AppComponent {
])
await this.appManager.activatePlugin(['settings'])
- await this.appManager.activatePlugin(['walkthrough', 'storage', 'search', 'compileAndRun', 'recorder', 'dgit'])
+ await this.appManager.activatePlugin(['walkthrough', 'storage', 'search', 'compileAndRun', 'recorder', 'dgitApi', 'dgit'])
await this.appManager.activatePlugin(['solidity-script', 'remix-templates'])
if (isElectron()){
diff --git a/libs/remix-ui/git/src/components/branchHeader.tsx b/libs/remix-ui/git/src/components/branchHeader.tsx
index 8ec568528d..ee8451ebea 100644
--- a/libs/remix-ui/git/src/components/branchHeader.tsx
+++ b/libs/remix-ui/git/src/components/branchHeader.tsx
@@ -16,12 +16,16 @@ export const BranchHeader = () => {
actions.getBranchDifferences(context.currentBranch, null, context)
}
if (!context.currentBranch || (context.currentBranch && context.currentBranch.name === '')) {
+ console.log(context)
if (context.currentHead === '') {
+ console.log('not detached')
setIsDetached(false)
} else {
+ console.log('detached')
setIsDetached(true)
}
} else {
+ console.log('not detached')
setIsDetached(false)
}
setLatestCommit(null)
@@ -46,7 +50,7 @@ export const BranchHeader = () => {
const getName = () => {
const url = context.currentBranch?.remote?.url
if (!url) return
- const regex = /https:\/\/github\.com\/[^/]+\/([^/]+)\.git/
+ const regex = /https:\/\/github\.com\/[^/]+\/([^/]+)(?:\.git)?/;
const match = url.match(regex)
return match ? match[1] : null
}
@@ -60,52 +64,37 @@ export const BranchHeader = () => {
const Heading = () => {
return (
-
+
-
+
{getName() ? (
-
- Repository Name:
-
-
- {getName() ?? ''}
-
-
-
+
+ {getName() ?? ''}
+
) : null
}
-
- Branch Name:
-
-
-
- {context.currentBranch && context.currentBranch.name}
-
+ {context.currentBranch && context.currentBranch.name ?
+
+ {context.currentBranch && context.currentBranch.name}{changed?'*':''}
+ : null}
+ {(latestCommit && latestCommit.commit && latestCommit.commit.message) ?
+
+ {latestCommit ?
+ latestCommit.commit && latestCommit.commit.message ? `"${latestCommit.commit.message}"` : '' : null}
+
+ : null}
+ {isDetached ?
+
+ {isDetached ?
+ <>You are in a detached state> : null}
-
+ : null}
{context.storage.enabled ?
-
-
- Storage :
-
- {context.storage.used} MB used
- ({context.storage.percentUsed} %)
-
-
-
: null}
-
-
- Messages :
-
-
- {latestCommit ?
- latestCommit.commit && latestCommit.commit.message ? latestCommit.commit.message : '' : null}
- {isDetached ?
- <>You are in a detached state>: null}
-
-
+
+ {context.storage.used} MB used
+ ({context.storage.percentUsed} %)
-
+ : null}
diff --git a/libs/remix-ui/git/src/components/github/repositoryselect.tsx b/libs/remix-ui/git/src/components/github/repositoryselect.tsx
index 212ce295dd..c546d51e59 100644
--- a/libs/remix-ui/git/src/components/github/repositoryselect.tsx
+++ b/libs/remix-ui/git/src/components/github/repositoryselect.tsx
@@ -9,6 +9,7 @@ import { TokenWarning } from '../panels/tokenWarning';
interface RepositorySelectProps {
select: (repo: repository) => void;
+ title: string;
}
const RepositorySelect = (props: RepositorySelectProps) => {
@@ -65,7 +66,7 @@ const RepositorySelect = (props: RepositorySelectProps) => {
return (
<>
{
show ?
diff --git a/libs/remix-ui/git/src/components/github/selectandclonerepositories.tsx b/libs/remix-ui/git/src/components/github/selectandclonerepositories.tsx
index c90c252eb2..80482958c1 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 (
<>
-
+
{ repo &&
}
diff --git a/libs/remix-ui/git/src/components/gitui.tsx b/libs/remix-ui/git/src/components/gitui.tsx
index b0f5337c58..adc4b7827a 100644
--- a/libs/remix-ui/git/src/components/gitui.tsx
+++ b/libs/remix-ui/git/src/components/gitui.tsx
@@ -164,7 +164,7 @@ export const GitUI = (props: IGitUi) => {
return (
<>{(!gitState.canUseApp) ?
:
-