add select as props

massalabs · Jun 18, 2024 · c50540b · c50540b
1 parent ee093c5
commit c50540b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/src/components/inputAmount/InputHead.tsx b/src/components/inputAmount/InputHead.tsx
@@ -4,7 +4,7 @@ import { ChainStatus } from '../Status/ChainStatus';
 import { useConnectorName } from '@/custom/bridge/useConnectorName';
 import { ChainContext } from '@/custom/bridge/useNetworkValidation';
 import Intl from '@/i18n/i18n';
-import { useAccountStore, useOperationStore } from '@/store/store';
+import { useAccountStore } from '@/store/store';
 import { maskAddress } from '@/utils/massaFormat';
 
 interface InputHeadProps {
@@ -13,14 +13,20 @@ interface InputHeadProps {
   dropdownOptions: IOption[];
   isMassaChain: boolean;
   isConnected: boolean;
+  select: number | undefined;
 }
 
 export function InputHead(props: InputHeadProps) {
-  const { address, context, dropdownOptions, isMassaChain, isConnected } =
-    props;
+  const {
+    address,
+    context,
+    dropdownOptions,
+    isMassaChain,
+    isConnected,
+    select,
+  } = props;
 
   const { currentProvider } = useAccountStore();
-  const { selectedEvm, availableEvmNetworks } = useOperationStore();
 
   const walletName = useConnectorName();
   const isReadyOnly = dropdownOptions.length <= 1;
@@ -39,7 +45,11 @@ export function InputHead(props: InputHeadProps) {
                   : Intl.t('connect-wallet.card-destination.to')}
               </>
             ) : (
-              <> {walletName} </>
+              <>
+                {isConnected
+                  ? walletName
+                  : Intl.t('connect-wallet.card-destination.from')}{' '}
+              </>
             )}
           </div>
           <ChainStatus context={context} isMassaChain={isMassaChain} />
@@ -49,9 +59,7 @@ export function InputHead(props: InputHeadProps) {
         <Dropdown
           readOnly={isReadyOnly}
           options={dropdownOptions}
-          select={
-            isMassaChain ? undefined : availableEvmNetworks.indexOf(selectedEvm)
-          }
+          select={select}
         />
       </div>
     </div>

diff --git a/src/pages/DaoPage/DaoInit/DaoHead.tsx b/src/pages/DaoPage/DaoInit/DaoHead.tsx
@@ -53,6 +53,7 @@ export function DaoHead(props: DaoHeadProps) {
           context={ChainContext.DAO}
           dropdownOptions={options}
           isConnected={isConnected}
+          select={undefined}
         />
 
         <div className="flex items-center justify-between gap-4">

diff --git a/src/pages/IndexPage/Layouts/BridgeRedeemLayout/BoxLayoutComponents/EvmBoxComponents.tsx b/src/pages/IndexPage/Layouts/BridgeRedeemLayout/BoxLayoutComponents/EvmBoxComponents.tsx
@@ -15,7 +15,9 @@ import {
 export function EVMHeader() {
   const { isConnected, address } = useAccount();
   const { currentMode, isMainnet: getIsMainnet } = useBridgeModeStore();
-  const { setSelectedEvm, setAmounts } = useOperationStore();
+  const { setSelectedEvm, setAmounts, selectedEvm, availableEvmNetworks } =
+    useOperationStore();
+
   const { resetSelectedToken } = useTokenStore();
   const isMainnet = getIsMainnet();
 
@@ -52,6 +54,7 @@ export function EVMHeader() {
       isMassaChain={false}
       isConnected={isConnected}
       dropdownOptions={options}
+      select={availableEvmNetworks.indexOf(selectedEvm)}
     />
   );
 }
diff --git a/src/pages/IndexPage/Layouts/BridgeRedeemLayout/BoxLayoutComponents/MassaBoxComponents.tsx b/src/pages/IndexPage/Layouts/BridgeRedeemLayout/BoxLayoutComponents/MassaBoxComponents.tsx
@@ -35,6 +35,7 @@ export function MassaHeader() {
         isMassaChain={true}
         context={ChainContext.BRIDGE}
         isConnected={isConnected}
+        select={undefined}
       />
     </div>
   );