From 0b5f29131c8051fb8ce0cb4ec142466840c2c101 Mon Sep 17 00:00:00 2001
From: yann300 <yann.levreau@gmail.com>
Date: Mon, 27 Feb 2023 10:55:36 +0100
Subject: [PATCH] disable "deploy" if no account is selected

---
 .../remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx | 1 +
 libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx       | 3 ++-
 libs/remix-ui/run-tab/src/lib/run-tab.tsx                      | 1 +
 libs/remix-ui/run-tab/src/lib/types/index.ts                   | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
index 6828170172..ef9d7fb720 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractDropdownUI.tsx
@@ -319,6 +319,7 @@ export function ContractDropdownUI (props: ContractDropdownProps) {
                 isValidProxyAddress={props.isValidProxyAddress}
                 isValidProxyUpgrade={isValidProxyUpgrade}
                 modal={props.modal}
+                disabled={props.selectedAccount === ''}
               />
               <div className="d-flex py-1 align-items-center custom-control custom-checkbox">
                 <input
diff --git a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
index bf1c45e77c..5e7b6361e8 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
@@ -280,7 +280,7 @@ export function ContractGUI (props: ContractGUIProps) {
             className={`udapp_instanceButton ${props.widthClass} btn btn-sm ${buttonOptions.classList}`}
             data-id={buttonOptions.dataId}
             data-title={buttonOptions.title}
-            disabled={toggleUpgradeImp && !proxyAddress}
+            disabled={(toggleUpgradeImp && !proxyAddress) || props.disabled}
           >
             <CustomTooltip
               placement={"right-start"}
@@ -415,6 +415,7 @@ export function ContractGUI (props: ContractGUIProps) {
                 onClick={handleExpandMultiClick}
                 data-id={buttonOptions.dataId}
                 className={`udapp_instanceButton ${buttonOptions.classList}`}
+                disabled={props.disabled}
               >
                 {buttonOptions.content}
               </button>
diff --git a/libs/remix-ui/run-tab/src/lib/run-tab.tsx b/libs/remix-ui/run-tab/src/lib/run-tab.tsx
index d01c86d6c4..ae5474e492 100644
--- a/libs/remix-ui/run-tab/src/lib/run-tab.tsx
+++ b/libs/remix-ui/run-tab/src/lib/run-tab.tsx
@@ -223,6 +223,7 @@ export function RunTabUI (props: RunTabProps) {
             passphrase={runTab.passphrase}
           />
           <ContractDropdownUI
+            selectedAccount={runTab.accounts.selectedAccount}
             syncContracts={syncContracts}
             exEnvironment={runTab.selectExEnv}
             contracts={runTab.contracts}
diff --git a/libs/remix-ui/run-tab/src/lib/types/index.ts b/libs/remix-ui/run-tab/src/lib/types/index.ts
index cbde8cd7da..a005664ed4 100644
--- a/libs/remix-ui/run-tab/src/lib/types/index.ts
+++ b/libs/remix-ui/run-tab/src/lib/types/index.ts
@@ -224,6 +224,7 @@ export type MainnetPrompt = (
   ) => JSX.Element
 
 export interface ContractDropdownProps {
+  selectedAccount: string,
   exEnvironment: string,
   contracts: {
     contractList: ContractList,