flaky

apps/remix-ide-e2e/src/tests/dgit_local.test.ts

@@ -51,7 +51,6 @@ module.exports = {
             .click('*[data-id="clone-btn"]')
             .clickLaunchIcon('filePanel')
             .waitForElementVisible('*[data-id="treeViewLitreeViewItemREADME.md"]')
-
     },
 
     // GROUP 1
@@ -198,8 +197,9 @@ module.exports = {
         browser.assert.ok(branches.includes('testbranch'))
     },
     'add file to new branch #group2': function (browser: NightwatchBrowser) {
-        browser.
+        browser
-            addFile('test.txt', { content: 'hello world' }, 'README.md')
+            .pause(1000)
+            .addFile('test.txt', { content: 'hello world' }, 'README.md')
             .clickLaunchIcon('dgit')
             .waitForElementVisible({
                 selector: "//*[@data-status='new-untracked' and @data-file='/test.txt']",

apps/remix-ide-e2e/src/tests/vyper_api.test.ts

@@ -29,13 +29,13 @@ module.exports = {
       .waitForElementVisible({
         selector: "//*[@data-id='workspacesSelect' and contains(.,'snekmate')]",
         locateStrategy: 'xpath',
-        timeout: 60000
+        timeout: 120000
       })
       .currentWorkspaceIs('snekmate')
       .waitForElementVisible({
         selector: "//*[@data-id='treeViewLitreeViewItemsrc' and contains(.,'src')]",
         locateStrategy: 'xpath',
-        timeout: 60000
+        timeout: 1200000
       })
       .openFile('src')
       .openFile('src/snekmate')

libs/remix-ui/git/src/components/panels/commands/pushpull.tsx

@@ -127,7 +127,7 @@ export const PushPull = () => {
   return (
     <>
 
-      <div className="btn-group w-100" role="group">
+      <div className="btn-group w-100 mt-2" role="group">
 
         <GitUIButton data-id='sourcecontrol-pull' disabledCondition={pushPullIsDisabled()} type="button" onClick={async () => pull()} className="btn btn-primary mr-1">Pull</GitUIButton>
         <GitUIButton data-id='sourcecontrol-push' disabledCondition={pushPullIsDisabled()} type="button" onClick={async () => push()} className="btn btn-primary">Push</GitUIButton>