From c39a9b104b22b57ca68099486975cab715fc0782 Mon Sep 17 00:00:00 2001
From: ioedeveloper <daviddisu8@gmail.com>
Date: Fri, 10 Feb 2023 11:32:46 +0100
Subject: [PATCH] Use custom dropdown

---
 .../src/lib/components/custom-dropdown.tsx    | 35 ++++++++++++++++
 .../helper/src/lib/remix-ui-helper.ts         |  2 +-
 .../src/lib/components/contractGUI.tsx        | 41 +++++++++++++++----
 3 files changed, 68 insertions(+), 10 deletions(-)

diff --git a/libs/remix-ui/helper/src/lib/components/custom-dropdown.tsx b/libs/remix-ui/helper/src/lib/components/custom-dropdown.tsx
index 61c27bce8e..77076ac67f 100644
--- a/libs/remix-ui/helper/src/lib/components/custom-dropdown.tsx
+++ b/libs/remix-ui/helper/src/lib/components/custom-dropdown.tsx
@@ -55,3 +55,38 @@ export const CustomMenu = React.forwardRef(
     )
   },
 )
+
+export const ProxyAddressToggle = React.forwardRef(({ children, onClick, className = '' }: { children: React.ReactNode, onClick: (e) => void, className: string }, ref: Ref<HTMLButtonElement>) => (
+  <button
+    ref={ref}
+    onClick={(e) => {
+      e.preventDefault()
+      onClick(e)
+    }}
+    className={className.replace('dropdown-toggle', '')}
+  >
+    <div className="d-flex">
+      <div className="mr-auto text-nowrap">{ children }</div>
+      <div><i className="fad fa-sort-circle"></i></div>
+    </div>
+  </button>
+))
+
+export const ProxyDropdownMenu = React.forwardRef(
+  ({ children, style, className, 'aria-labelledby': labeledBy }: { children: React.ReactNode, style?: React.CSSProperties, className: string, 'aria-labelledby'?: string }, ref: Ref<HTMLDivElement>) => {
+    return (
+      <div
+        ref={ref}
+        style={style}
+        className={className}
+        aria-labelledby={labeledBy}
+      >
+        <ul className="list-unstyled mb-0">
+          {
+           children
+          }
+        </ul>
+      </div>
+    )
+  },
+)
diff --git a/libs/remix-ui/helper/src/lib/remix-ui-helper.ts b/libs/remix-ui/helper/src/lib/remix-ui-helper.ts
index c4d6ce6cb8..17d4af95a3 100644
--- a/libs/remix-ui/helper/src/lib/remix-ui-helper.ts
+++ b/libs/remix-ui/helper/src/lib/remix-ui-helper.ts
@@ -129,7 +129,7 @@ export const addSlash = (file: string) => {
   return file
 }
 
-export const shortenDeploymentAddresses = (address: string, date: Date) => {
+export const shortenAddressAndDate = (address: string, date: Date) => {
   const len = address.length
 
   return address.slice(0, 5) + '...' + address.slice(len - 5, len) + ' (' + date.toString() + ')'
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 3cd52134c9..883bac2d00 100644
--- a/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
+++ b/libs/remix-ui/run-tab/src/lib/components/contractGUI.tsx
@@ -4,7 +4,8 @@ import { FormattedMessage, useIntl } from 'react-intl'
 import * as remixLib from '@remix-project/remix-lib'
 import { ContractGUIProps } from '../types'
 import { CopyToClipboard } from '@remix-ui/clipboard'
-import { CustomTooltip, shortenDeploymentAddresses } from '@remix-ui/helper'
+import { CustomTooltip, ProxyAddressToggle, ProxyDropdownMenu, shortenAddressAndDate } from '@remix-ui/helper'
+import { Dropdown } from 'react-bootstrap'
 
 const txFormat = remixLib.execution.txFormat
 const txHelper = remixLib.execution.txHelper
@@ -23,6 +24,7 @@ export function ContractGUI (props: ContractGUIProps) {
   const [deployState, setDeployState] = useState<{ deploy: boolean, upgrade: boolean }>({ deploy: false, upgrade: false })
   const [proxyAddress, setProxyAddress] = useState<string>('')
   const [proxyAddressError, setProxyAddressError] = useState<string>('')
+  const [showDropdown, setShowDropdown] = useState<boolean>(false)
   const multiFields = useRef<Array<HTMLInputElement | null>>([])
   const initializeFields = useRef<Array<HTMLInputElement | null>>([])
   const basicInputRef = useRef<HTMLInputElement>()
@@ -228,9 +230,8 @@ export function ContractGUI (props: ContractGUIProps) {
     setDeployState({ deploy: false, upgrade: value })
   }
 
-  const handleSelectProxyAddress = (e) => {
-    const value = e.target.value
-    setProxyAddress(value)
+  const switchProxyAddress = (address: string) => {
+    setProxyAddress(address)
   }
 
   const validateProxyAddress = async (address: string) => {
@@ -245,6 +246,10 @@ export function ContractGUI (props: ContractGUIProps) {
     }
   }
 
+  const toggleDropdown = (isOpen: boolean) => {
+    setShowDropdown(isOpen)
+  }
+
   return (
     <div
       className={`udapp_contractProperty ${
@@ -507,13 +512,31 @@ export function ContractGUI (props: ContractGUIProps) {
               toggleUpgradeImp ? "d-flex" : "d-none"
             }`}
           >
+            <Dropdown onToggle={toggleDropdown} show={showDropdown}>
+              <Dropdown.Toggle as={ProxyAddressToggle} id="dropdown-custom-components" className="btn btn-light btn-block w-100 d-inline-block border border-dark form-control mt-1">
+                { proxyAddress }
+              </Dropdown.Toggle>
+
+              <Dropdown.Menu as={ProxyDropdownMenu} className='w-100 custom-dropdown-items' data-id="custom-dropdown-items">
+                {
+                  props.proxy.deployments.map((deployment, index) => (
+                    <Dropdown.Item
+                      key={index}
+                      onClick={() => {
+                        switchProxyAddress(deployment.address)
+                      }}
+                    >
+                        <div className='d-flex justify-content-between'>
+                          <span>{ proxyAddress === deployment.address ? <span>&#10003; { shortenAddressAndDate(deployment.address, deployment.date) } </span> : <span className="pl-3">{ shortenAddressAndDate(deployment.address, deployment.date) }</span> }</span>
+                          <i className='fas fa-code-branch pt-1'></i>
+                        </div> 
+                      </Dropdown.Item>
+                    ))
+                  }
+                </Dropdown.Menu>
+              </Dropdown>
             <div className={`flex-column 'd-flex'}`}>
                 <div className="mb-2">
-                  <select data-id="udappSelectProxyAddress" name="selectproxy" className="form-control udapp_select custom-select pr-4" value={proxyAddress} onChange={handleSelectProxyAddress}>
-                    {
-                      props.proxy.deployments.map((deployment, index) => <option value={deployment.address} key={index}>{ shortenDeploymentAddresses(deployment.address, deployment.date) }</option>)
-                    }
-                  </select>
                   { proxyAddressError && <span className='text-lowercase' data-id="errorMsgProxyAddress" style={{ fontSize: '.8em' }}>{ proxyAddressError }</span> }
                 </div>
             </div>