From 58e2a86e1925ada7ec7d678d6b4aa6bc81cf5ebd Mon Sep 17 00:00:00 2001
From: "davidzagi93@gmail.com" <davidzagi93@gmail.com>
Date: Tue, 14 Sep 2021 11:10:01 +0100
Subject: [PATCH] implementing changes overridden

---
 apps/remix-ide-e2e/src/tests/defaultLayout.test.ts   |  8 ++++----
 apps/remix-ide/src/app/panels/terminal.js            |  1 +
 libs/remix-ui/plugin-manager/src/types.d.ts          | 10 +---------
 libs/remix-ui/terminal/src/lib/remix-ui-terminal.css |  3 ---
 libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx |  3 +--
 5 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/apps/remix-ide-e2e/src/tests/defaultLayout.test.ts b/apps/remix-ide-e2e/src/tests/defaultLayout.test.ts
index 94bc20207d..6a0a20f083 100644
--- a/apps/remix-ide-e2e/src/tests/defaultLayout.test.ts
+++ b/apps/remix-ide-e2e/src/tests/defaultLayout.test.ts
@@ -50,11 +50,11 @@ module.exports = {
 
   'Toggles Terminal': function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('div[data-id="terminalContainer"]')
-      .assert.visible('div[data-id="terminalContainerDisplay"]')
+      .assert.elementPresent('div[data-id="terminalContainerDisplay"]')
       .click('i[data-id="terminalToggleIcon"]')
-      .checkElementStyle('div[data-id="terminalToggleMenu"]', 'height', '35px')
-      .click('i[data-id="terminalToggleIcon"]')
-      .assert.visible('div[data-id="terminalContainerDisplay"]')
+      .checkElementStyle('div[data-id="terminalContainer-view"]', 'height', '36px')
+      // .click('i[data-id="terminalToggleIcon"]')
+      // .assert.visible('div[data-id="terminalContainerDisplay"]')
   },
 
   'Switch Tabs using tabs icon': function (browser: NightwatchBrowser) {
diff --git a/apps/remix-ide/src/app/panels/terminal.js b/apps/remix-ide/src/app/panels/terminal.js
index 081b868e21..a62678de93 100644
--- a/apps/remix-ide/src/app/panels/terminal.js
+++ b/apps/remix-ide/src/app/panels/terminal.js
@@ -39,6 +39,7 @@ class Terminal extends Plugin {
     this.element = document.createElement('div')
     this.element.setAttribute('class', 'panel')
     this.element.setAttribute('id', 'terminal-view')
+    this.element.setAttribute('data-id', 'terminalContainer-view')
     this.eventsDecoder = this.globalRegistry.get('eventsDecoder').api
     this.txListener = this.globalRegistry.get('txlistener').api
     this.sourceHighlighter = new SourceHighlighter()
diff --git a/libs/remix-ui/plugin-manager/src/types.d.ts b/libs/remix-ui/plugin-manager/src/types.d.ts
index 53135dd7d0..ffe425c473 100644
--- a/libs/remix-ui/plugin-manager/src/types.d.ts
+++ b/libs/remix-ui/plugin-manager/src/types.d.ts
@@ -178,17 +178,9 @@ export interface FormStateProps {
   url: string
   type: 'iframe' | 'ws'
   hash: string
-  methods: string[]
+  methods: any
   location: string
-<<<<<<< HEAD
-<<<<<<< HEAD
-  canActivate?: any
-=======
   canActivate: any
->>>>>>> ceb5496f4 (fix whitespaces and canactivate)
-=======
-  canActivate: string[]
->>>>>>> cb86d9b5a (Update types.d.ts)
 }
 
 export type PluginManagerProfile = Profile & {
diff --git a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.css b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.css
index bab8759a36..eadcabb373 100644
--- a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.css
+++ b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.css
@@ -20,9 +20,6 @@ element.style {
 .border-primary {
   border-color: #007aa6!important;
 }
-.border {
-  border: 1px solid #3f4455!important;
-}
 
 /* seleted option should reflect the theme color */
 .selectedOptions {
diff --git a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
index 3cb763aed3..f1a32d18a7 100644
--- a/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
+++ b/libs/remix-ui/terminal/src/lib/remix-ui-terminal.tsx
@@ -461,7 +461,6 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
           </div>
           {/* ${self._view.pendingTxCount} */}
           <div className="mx-2" title='Pending Transactions'>0</div>
-          <div className="verticalLine"></div>
           <div className="pt-1 h-80 mx-3 align-items-center listenOnNetwork custom-control custom-checkbox">
             <input
               className="custom-control-input"
@@ -498,7 +497,7 @@ export const RemixUiTerminal = (props: RemixUiTerminalProps) => {
           handleAutoComplete()
         }
         <div data-id='terminalContainerDisplay' style = {{
-          position: 'absolute',
+          position: 'relative',
           height: '100%',
           width: '100%',
           opacity: '0.1',