From bc3d8ed41ebc9a6580ff234573586d35eed67f88 Mon Sep 17 00:00:00 2001 From: Nicolas Molina Date: Mon, 20 Jan 2025 15:05:27 -0300 Subject: [PATCH] fix: adding warning message when user select injected provider --- .../wizard/components/ApprovalProcess.svelte | 205 ++++++++++-------- 1 file changed, 117 insertions(+), 88 deletions(-) diff --git a/src/lib/wizard/components/ApprovalProcess.svelte b/src/lib/wizard/components/ApprovalProcess.svelte index b93e049..0ebbea0 100644 --- a/src/lib/wizard/components/ApprovalProcess.svelte +++ b/src/lib/wizard/components/ApprovalProcess.svelte @@ -2,20 +2,27 @@ import { globalState } from "$lib/state/state.svelte"; import Dropdown from "./shared/Dropdown.svelte"; import { abbreviateAddress } from "$lib/utils/helpers"; - import { approvalProcessTypes, type ApprovalProcess, type ApprovalProcessType } from "$lib/models/approval-process"; + import { + approvalProcessTypes, + type ApprovalProcess, + type ApprovalProcessType, + } from "$lib/models/approval-process"; import type { DropdownItem, GlobalState } from "$lib/models/ui"; import type { Relayer } from "$lib/models/relayer"; import { getNetworkLiteral } from "$lib/models/network"; import Input from "./shared/Input.svelte"; import Message from "./shared/Message.svelte"; - let address = $state(globalState.form.approvalProcessToCreate?.via || ""); + let address = $state( + globalState.form.approvalProcessToCreate?.via || "" + ); function approvalProcessByNetworkAndComponent(ap: ApprovalProcess) { - const networkName = typeof globalState.form.network === 'string' - ? globalState.form.network - : globalState.form.network?.name; - + const networkName = + typeof globalState.form.network === "string" + ? globalState.form.network + : globalState.form.network?.name; + return ap.network === networkName && ap.component?.includes("deploy"); } @@ -63,7 +70,9 @@ viaType: "Relayer", via: relayer.value.address, relayerId: relayer.value.relayerId, - network: globalState.form.network && getNetworkLiteral(globalState.form.network), + network: + globalState.form.network && + getNetworkLiteral(globalState.form.network), }; } }; @@ -75,7 +84,8 @@ globalState.form.approvalProcessToCreate = { viaType: approvalProcessType as "EOA" | "Safe" | "Relayer", via: element.value, - network: globalState.form.network && getNetworkLiteral(globalState.form.network), + network: + globalState.form.network && getNetworkLiteral(globalState.form.network), }; }; @@ -91,102 +101,115 @@ }; let disableCreation = $derived.by(() => - globalState.approvalProcesses.some(approvalProcessByNetworkAndComponent), + globalState.approvalProcesses.some(approvalProcessByNetworkAndComponent) ); - let disableRelayers = $derived.by(() => - !globalState.permissions?.includes("manage-relayers") + let disableRelayers = $derived.by( + () => !globalState.permissions?.includes("manage-relayers") );
- onRadioChange(e)} - checked - /> -
-
- {#key globalState.form.approvalProcessSelected} - onSelectApprovalProcess(e.detail)} - disabled={radioSelected !== "existing"} - defaultItem={globalState.form.approvalProcessSelected - ? { - label: toDisplayName(globalState.form.approvalProcessSelected), - value: globalState.form.approvalProcessSelected, - } - : undefined} - emptyLabel="No Approval Processes Available" + onRadioChange(e)} + checked /> - {/key} -
+ +
+
+ {#key globalState.form.approvalProcessSelected} + onSelectApprovalProcess(e.detail)} + disabled={radioSelected !== "existing"} + defaultItem={globalState.form.approvalProcessSelected + ? { + label: toDisplayName(globalState.form.approvalProcessSelected), + value: globalState.form.approvalProcessSelected, + } + : undefined} + emptyLabel="No Approval Processes Available" + /> + {/key} +
- - +> +
+
- onSelectApprovalProcessType(e.detail)} - disabled={radioSelected !== "new" || disableCreation} - defaultItem={{ - label: approvalProcessType, - value: approvalProcessType, - }} - /> + onSelectApprovalProcessType(e.detail)} + disabled={radioSelected !== "new" || disableCreation} + defaultItem={{ + label: approvalProcessType, + value: approvalProcessType, + }} + /> - {#if approvalProcessType === "EOA" || approvalProcessType === "Safe"} -
- -
- {:else if approvalProcessType === "Relayer"} - {#if disableRelayers} -
- + {#if approvalProcessType === "EOA" || approvalProcessType === "Safe"} +
+
- {:else} - onSelectRelayer(e.detail)} - disabled={radioSelected !== "new" || disableCreation} - /> + {:else if approvalProcessType === "Relayer"} + {#if disableRelayers} +
+ +
+ {:else} + onSelectRelayer(e.detail)} + disabled={radioSelected !== "new" || disableCreation} + /> + {/if} {/if} - {/if} -
+
+
+
+ +