From 88662a466b7fe8cb0e041df7de3f83db55d46584 Mon Sep 17 00:00:00 2001
From: Igor Vinokur <ivinokur@redhat.com>
Date: Mon, 27 May 2019 17:04:29 +0300
Subject: [PATCH] Fix icon after toggle

Signed-off-by: Igor Vinokur <ivinokur@redhat.com>
---
 packages/git/src/browser/git-contribution.ts |  6 ++----
 packages/scm/src/browser/scm-widget.tsx      | 13 +++++++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/packages/git/src/browser/git-contribution.ts b/packages/git/src/browser/git-contribution.ts
index 477de8bf350ea..380dbec8795b3 100644
--- a/packages/git/src/browser/git-contribution.ts
+++ b/packages/git/src/browser/git-contribution.ts
@@ -121,8 +121,7 @@ export namespace GIT_COMMANDS {
         id: 'git-commit-add-sign-off',
         label: 'Add Signed-off-by',
         iconClass: 'fa fa-pencil-square-o',
-        category: 'navigation',
-        props: { ['group']: 'navigation' }
+        category: 'navigation'
     };
     export const COMMIT_AMEND = {
         id: 'git.commit.amend'
@@ -224,8 +223,7 @@ export namespace GIT_COMMANDS {
         id: 'git-refresh',
         label: 'Refresh',
         iconClass: 'fa fa-refresh',
-        category: 'navigation',
-        props: { ['group']: 'navigation' }
+        category: 'navigation'
     };
 }
 
diff --git a/packages/scm/src/browser/scm-widget.tsx b/packages/scm/src/browser/scm-widget.tsx
index 3360d1674b1a0..49a1aaba0f5f1 100644
--- a/packages/scm/src/browser/scm-widget.tsx
+++ b/packages/scm/src/browser/scm-widget.tsx
@@ -87,10 +87,6 @@ export class ScmWidget extends ScmNavigableListWidget<ScmResource> implements St
     constructor() {
         super();
         this.id = 'theia-scmContainer';
-        this.title.label = ScmWidget.LABEL;
-        this.title.caption = ScmWidget.LABEL;
-        this.title.closable = true;
-        this.title.iconClass = 'scm-tab-icon';
         this.addClass('theia-scm');
         this.scrollContainer = ScmWidget.Styles.GROUPS_CONTAINER;
 
@@ -127,6 +123,15 @@ export class ScmWidget extends ScmNavigableListWidget<ScmResource> implements St
         });
     }
 
+    protected onBeforeAttach(msg: Message): void {
+        const repository = this.scmService.selectedRepository;
+        this.title.iconClass = 'scm-tab-icon';
+        this.title.label = ScmWidget.LABEL + (repository ? ': ' + repository.provider.contextValue : '');
+        this.title.caption = ScmWidget.LABEL;
+        this.title.closable = true;
+        super.onBeforeAttach(msg);
+    }
+
     get onUpdate(): CoreEvent<void> {
         return this.onUpdateEmitter.event;
     }