diff --git a/apps/remix-ide/src/app/tabs/debugger-tab.js b/apps/remix-ide/src/app/tabs/debugger-tab.js index cd06ea4ffa..03bd672110 100644 --- a/apps/remix-ide/src/app/tabs/debugger-tab.js +++ b/apps/remix-ide/src/app/tabs/debugger-tab.js @@ -5,7 +5,7 @@ import { ViewPlugin } from '@remixproject/engine-web' import * as packageJson from '../../../../../package.json' import React from 'react' // eslint-disable-line import { bleach } from '@remix-ui/helper' -import { compilationFinishedToastMsg, compilingToastMsg, localCompilationToastMsg, notFoundToastMsg, sourceVerificationNotAvailableToastMsg } from '@remix-ui/helper' +import { compilationFinishedToastMsg, compilingToastMsg, notFoundToastMsg, sourceVerificationNotAvailableToastMsg } from '@remix-ui/helper' const css = require('./styles/debugger-tab-styles') const profile = { diff --git a/apps/remix-ide/src/app/tabs/locales/en/debugger.json b/apps/remix-ide/src/app/tabs/locales/en/debugger.json index 035d160461..dc46390eed 100644 --- a/apps/remix-ide/src/app/tabs/locales/en/debugger.json +++ b/apps/remix-ide/src/app/tabs/locales/en/debugger.json @@ -2,6 +2,7 @@ "debugger.displayName": "Debugger", "debugger.debuggerConfiguration": "Debugger Configuration", "debugger.stopDebugging": "Stop debugging", + "debugger.provideTxNumber": "Please provide a valid transaction hash", "debugger.startDebugging": "Start debugging", "debugger.placeholder": "Transaction hash, should start with 0x", "debugger.debugLocaNodeLabel": "Force using local node", diff --git a/apps/remix-ide/src/app/tabs/locales/es/debugger.json b/apps/remix-ide/src/app/tabs/locales/es/debugger.json index 2a7d40f1da..b284c6b21d 100644 --- a/apps/remix-ide/src/app/tabs/locales/es/debugger.json +++ b/apps/remix-ide/src/app/tabs/locales/es/debugger.json @@ -2,6 +2,7 @@ "debugger.displayName": "Debugger", "debugger.debuggerConfiguration": "Debugger Configuration", "debugger.stopDebugging": "Stop debugging", + "debugger.provideTxNumber": "Please provide a valid transaction hash", "debugger.startDebugging": "Start debugging", "debugger.placeholder": "Transaction hash, should start with 0x", "debugger.debugLocaNodeLabel": "Force using local node", diff --git a/apps/remix-ide/src/app/tabs/locales/fr/debugger.json b/apps/remix-ide/src/app/tabs/locales/fr/debugger.json index 4785d65fce..463d389ddc 100644 --- a/apps/remix-ide/src/app/tabs/locales/fr/debugger.json +++ b/apps/remix-ide/src/app/tabs/locales/fr/debugger.json @@ -2,6 +2,7 @@ "debugger.displayName": "Debugger", "debugger.debuggerConfiguration": "Debugger Configuration", "debugger.stopDebugging": "Stop debugging", + "debugger.provideTxNumber": "Please provide a valid transaction hash", "debugger.startDebugging": "Start debugging", "debugger.placeholder": "Transaction hash, should start with 0x", "debugger.debugLocaNodeLabel": "Forcer l'utilisation d'un noeud local", diff --git a/apps/remix-ide/src/app/tabs/locales/zh/debugger.json b/apps/remix-ide/src/app/tabs/locales/zh/debugger.json index 4eb729b4cc..daa22e3188 100644 --- a/apps/remix-ide/src/app/tabs/locales/zh/debugger.json +++ b/apps/remix-ide/src/app/tabs/locales/zh/debugger.json @@ -2,6 +2,7 @@ "debugger.displayName": "调试器", "debugger.debuggerConfiguration": "调试器配置", "debugger.stopDebugging": "停止调试", + "debugger.provideTxNumber": "Please provide a valid transaction hash", "debugger.startDebugging": "开始调试", "debugger.placeholder": "交易哈希, 应该以 0x 开头", "debugger.debugLocaNodeLabel": "强制使用本地节点", diff --git a/apps/remix-ide/src/assets/css/themes/bootstrap-cerulean.min.css b/apps/remix-ide/src/assets/css/themes/bootstrap-cerulean.min.css index 1bfee425c4..3ed6161e19 100644 --- a/apps/remix-ide/src/assets/css/themes/bootstrap-cerulean.min.css +++ b/apps/remix-ide/src/assets/css/themes/bootstrap-cerulean.min.css @@ -2118,6 +2118,7 @@ textarea.form-control { } .btn { + cursor: pointer; display:inline-block; font-weight:400; color:#495057; @@ -2150,7 +2151,8 @@ textarea.form-control { box-shadow:0 0 0 .2rem rgba(47,164,231,.25) } .btn.disabled,.btn:disabled { - opacity:.65 + opacity:.65; + cursor: not-allowed } .btn:not(:disabled):not(.disabled) { cursor:pointer diff --git a/apps/remix-ide/src/assets/css/themes/bootstrap-cyborg.min.css b/apps/remix-ide/src/assets/css/themes/bootstrap-cyborg.min.css index 52e76c75f6..136e53ff42 100644 --- a/apps/remix-ide/src/assets/css/themes/bootstrap-cyborg.min.css +++ b/apps/remix-ide/src/assets/css/themes/bootstrap-cyborg.min.css @@ -2119,6 +2119,7 @@ textarea.form-control { } .btn { + cursor: pointer;; display:inline-block; font-weight:400; color:#adafae; @@ -2151,7 +2152,8 @@ textarea.form-control { box-shadow:0 0 0 .2rem rgba(42,159,214,.25) } .btn.disabled,.btn:disabled { - opacity:.65 + opacity:.65; + cursor: not-allowed; } .btn:not(:disabled):not(.disabled) { cursor:pointer diff --git a/apps/remix-ide/src/assets/css/themes/bootstrap-flatly.min.css b/apps/remix-ide/src/assets/css/themes/bootstrap-flatly.min.css index 19e49b7056..e9b14b99af 100644 --- a/apps/remix-ide/src/assets/css/themes/bootstrap-flatly.min.css +++ b/apps/remix-ide/src/assets/css/themes/bootstrap-flatly.min.css @@ -2121,6 +2121,7 @@ textarea.form-control { } .btn { + cursor: pointer; display:inline-block; font-weight:400; color:#212529; @@ -2152,7 +2153,8 @@ textarea.form-control { box-shadow:0 0 0 .2rem rgba(44,62,80,.25) } .btn.disabled,.btn:disabled { - opacity:.65 + opacity:.65; + cursor: not-allowed; } .btn:not(:disabled):not(.disabled) { cursor:pointer diff --git a/apps/remix-ide/src/assets/css/themes/bootstrap-spacelab.min.css b/apps/remix-ide/src/assets/css/themes/bootstrap-spacelab.min.css index 7eb2d90e25..3129408286 100644 --- a/apps/remix-ide/src/assets/css/themes/bootstrap-spacelab.min.css +++ b/apps/remix-ide/src/assets/css/themes/bootstrap-spacelab.min.css @@ -2121,6 +2121,7 @@ textarea.form-control { } .btn { + cursor: pointer; display:inline-block; font-weight:400; color:#777; @@ -2153,7 +2154,8 @@ textarea.form-control { box-shadow:0 0 0 .2rem rgba(68,110,155,.25) } .btn.disabled,.btn:disabled { - opacity:.65 + opacity:.65; + cursor: not-allowed } .btn:not(:disabled):not(.disabled) { cursor:pointer diff --git a/apps/remix-ide/src/assets/css/themes/remix-black_undtds.css b/apps/remix-ide/src/assets/css/themes/remix-black_undtds.css index d917e3095c..5c16277d2e 100644 --- a/apps/remix-ide/src/assets/css/themes/remix-black_undtds.css +++ b/apps/remix-ide/src/assets/css/themes/remix-black_undtds.css @@ -2096,6 +2096,7 @@ textarea.form-control.is-invalid { } } .btn { + cursor: pointer; display: inline-block; font-weight: 400; color: #d5d5d5; @@ -2127,6 +2128,7 @@ textarea.form-control.is-invalid { .btn.disabled, .btn:disabled { opacity: 0.65; + cursor: not-allowed } a.btn.disabled, fieldset:disabled a.btn { diff --git a/apps/remix-ide/src/assets/css/themes/remix-candy_ikhg4m.css b/apps/remix-ide/src/assets/css/themes/remix-candy_ikhg4m.css index c30c7e0aba..73574f8f5f 100644 --- a/apps/remix-ide/src/assets/css/themes/remix-candy_ikhg4m.css +++ b/apps/remix-ide/src/assets/css/themes/remix-candy_ikhg4m.css @@ -2314,6 +2314,7 @@ textarea.form-control.is-invalid { } .btn { + cursor: pointer; display: inline-block; font-weight: 400; color: #0f7292; @@ -2346,6 +2347,7 @@ textarea.form-control.is-invalid { .btn.disabled, .btn:disabled { opacity: 0.7; + cursor: not-allowed } a.btn.disabled, diff --git a/apps/remix-ide/src/assets/css/themes/remix-dark_tvx1s2.css b/apps/remix-ide/src/assets/css/themes/remix-dark_tvx1s2.css index 3f21f14247..f512a127c8 100644 --- a/apps/remix-ide/src/assets/css/themes/remix-dark_tvx1s2.css +++ b/apps/remix-ide/src/assets/css/themes/remix-dark_tvx1s2.css @@ -2097,6 +2097,7 @@ textarea.form-control.is-invalid { } } .btn { + cursor: pointer; display: inline-block; font-weight: 400; color: #fff; @@ -2128,6 +2129,7 @@ textarea.form-control.is-invalid { .btn.disabled, .btn:disabled { opacity: 0.65; + cursor: not-allowed } a.btn.disabled, fieldset:disabled a.btn { diff --git a/apps/remix-ide/src/assets/css/themes/remix-hacker_owl.css b/apps/remix-ide/src/assets/css/themes/remix-hacker_owl.css index 3513bd73fc..0ef4225d57 100644 --- a/apps/remix-ide/src/assets/css/themes/remix-hacker_owl.css +++ b/apps/remix-ide/src/assets/css/themes/remix-hacker_owl.css @@ -2111,6 +2111,7 @@ textarea.form-control.is-invalid { } } .btn { + cursor: pointer; display: inline-block; font-weight: 400; color: #fff; @@ -2142,6 +2143,7 @@ textarea.form-control.is-invalid { .btn.disabled, .btn:disabled { opacity: 0.65; + cursor: not-allowed; } a.btn.disabled, fieldset:disabled a.btn { diff --git a/apps/remix-ide/src/assets/css/themes/remix-light_powaqg.css b/apps/remix-ide/src/assets/css/themes/remix-light_powaqg.css index c44e0a927c..3217df2899 100644 --- a/apps/remix-ide/src/assets/css/themes/remix-light_powaqg.css +++ b/apps/remix-ide/src/assets/css/themes/remix-light_powaqg.css @@ -2310,6 +2310,7 @@ textarea.form-control.is-invalid { } .btn { + cursor: pointer; display: inline-block; font-weight: 400; color: #2e3145; @@ -2342,6 +2343,7 @@ textarea.form-control.is-invalid { .btn.disabled, .btn:disabled { opacity: 0.7; + cursor: not-allowed; } a.btn.disabled, diff --git a/apps/remix-ide/src/assets/css/themes/remix-midcentury_hrzph3.css b/apps/remix-ide/src/assets/css/themes/remix-midcentury_hrzph3.css index f9005585b4..f64bc8d01b 100644 --- a/apps/remix-ide/src/assets/css/themes/remix-midcentury_hrzph3.css +++ b/apps/remix-ide/src/assets/css/themes/remix-midcentury_hrzph3.css @@ -2315,6 +2315,7 @@ textarea.form-control.is-invalid { } .btn { + cursor: pointer; display: inline-block; font-weight: 400; color: #062809; @@ -2347,6 +2348,7 @@ textarea.form-control.is-invalid { .btn.disabled, .btn:disabled { opacity: 0.7; + cursor: not-allowed; } a.btn.disabled, diff --git a/apps/remix-ide/src/assets/css/themes/remix-unicorn.css b/apps/remix-ide/src/assets/css/themes/remix-unicorn.css index 9055f297a6..ebf508ff83 100644 --- a/apps/remix-ide/src/assets/css/themes/remix-unicorn.css +++ b/apps/remix-ide/src/assets/css/themes/remix-unicorn.css @@ -2313,6 +2313,7 @@ textarea.form-control.is-invalid { } .btn { + cursor: pointer; display: inline-block; font-weight: 400; color: #2e3145; @@ -2346,6 +2347,7 @@ textarea.form-control.is-invalid { .btn.disabled, .btn:disabled { opacity: 0.7; + cursor: not-allowed; } a.btn.disabled, diff --git a/apps/remix-ide/src/assets/css/themes/remix-violet.css b/apps/remix-ide/src/assets/css/themes/remix-violet.css index fab11de9fb..275d0f0907 100644 --- a/apps/remix-ide/src/assets/css/themes/remix-violet.css +++ b/apps/remix-ide/src/assets/css/themes/remix-violet.css @@ -2310,6 +2310,7 @@ textarea.form-control.is-invalid { } .btn { + cursor: pointer; display: inline-block; font-weight: 400; color: #2e3145; @@ -2342,6 +2343,7 @@ textarea.form-control.is-invalid { .btn.disabled, .btn:disabled { opacity: 0.7; + cursor: not-allowed; } a.btn.disabled, diff --git a/libs/remix-ui/debugger-ui/src/lib/api/debugger-api.ts b/libs/remix-ui/debugger-ui/src/lib/api/debugger-api.ts index 34fc44ed7e..0879471fe8 100644 --- a/libs/remix-ui/debugger-ui/src/lib/api/debugger-api.ts +++ b/libs/remix-ui/debugger-ui/src/lib/api/debugger-api.ts @@ -163,7 +163,7 @@ export const DebuggerApiMixin = (Base) => class extends Base { else this._web3 = this.initialWeb3 init.extendWeb3(this._web3) if (this.onDebugRequestedListener) { - this.onDebugRequestedListener(hash, web3).then((debuggerBackend) => { + this.onDebugRequestedListener(hash, this._web3).then((debuggerBackend) => { this.debuggerBackend = debuggerBackend }) } diff --git a/libs/remix-ui/debugger-ui/src/lib/button-navigator/button-navigator.css b/libs/remix-ui/debugger-ui/src/lib/button-navigator/button-navigator.css index 628182ece1..f8b3b7926a 100644 --- a/libs/remix-ui/debugger-ui/src/lib/button-navigator/button-navigator.css +++ b/libs/remix-ui/debugger-ui/src/lib/button-navigator/button-navigator.css @@ -9,8 +9,6 @@ align-items: center; color: #fff; } -.stepButton { -} .stepButtonDisabled { background-color: #005573; @@ -29,11 +27,9 @@ align-items: center; color: #fff; } -.jumpButton { -} .jumpButtonDisabled { - background-color: var(--grey); + background-color: var(--gray); border-color: #005573; } @@ -42,10 +38,6 @@ background-color: #005573; border-color: #005573; } -.navigator { -} -.navigator:hover { -} .cursorPointerRemixDebugger { cursor: pointer; diff --git a/libs/remix-ui/debugger-ui/src/lib/button-navigator/button-navigator.tsx b/libs/remix-ui/debugger-ui/src/lib/button-navigator/button-navigator.tsx index a050280d2f..2c7aed6603 100644 --- a/libs/remix-ui/debugger-ui/src/lib/button-navigator/button-navigator.tsx +++ b/libs/remix-ui/debugger-ui/src/lib/button-navigator/button-navigator.tsx @@ -66,13 +66,13 @@ export const ButtonNavigation = ({ } const stepBtnStyle = 'd-flex align-items-center justify-content-center btn btn-primary btn-sm stepButton h-75 m-0 p-1' - const disableStepBtnStyle = 'stepButtonDisabled' - const disableJumpBtnStyle = 'jumpButtonDisabled' + const disableStepBtnStyle = 'disabled' + const disableJumpBtnStyle = 'disabled' const stepMarkupStructure = { stepOverBackJSX: { markup: (
{ stepOverBack && stepOverBack() }} @@ -97,7 +97,7 @@ export const ButtonNavigation = ({ stepBackJSX: { markup: (
{ stepIntoBack && stepIntoBack() }} @@ -126,7 +126,7 @@ export const ButtonNavigation = ({ stepIntoJSX: { markup: (
{ stepIntoForward && stepIntoForward() }} @@ -154,7 +154,7 @@ export const ButtonNavigation = ({ stepOverForwardJSX: { markup: (
{ stepOverForward && stepOverForward() }} @@ -183,7 +183,7 @@ export const ButtonNavigation = ({ jumpPreviousBreakpointJSX: { markup: (
{ jumpPreviousBreakpoint && jumpPreviousBreakpoint() @@ -191,7 +191,7 @@ export const ButtonNavigation = ({ data-id="buttonNavigatorJumpPreviousBreakpoint" >