pull/5026/head
bunsenstraat 4 months ago committed by Aniket
parent cfc023f656
commit e9ba1571e8
  1. 2
      apps/remix-ide-e2e/src/tests/dgit_github.test.ts
  2. 14
      libs/remix-ui/git/src/components/panels/branches.tsx

@ -153,7 +153,7 @@ module.exports = {
'check the local branches #group1': function (browser: NightwatchBrowser) {
browser
.waitForElementVisible({
selector: '//*[@data-id="branches-panel-content"]//*[@data-id="branches-toggle-current-branch-links"]',
selector: '//*[@data-id="branches-panel-content-local-branches"]//*[@data-id="branches-toggle-current-branch-links"]',
locateStrategy: 'xpath'
})
},

@ -23,12 +23,14 @@ 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>
);
})}
<div data-id='branches-panel-content-local-branches'>
<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>
);
})}
</div>
<hr />
{context.upstream ?
<>

Loading…
Cancel
Save