types and format

packages/ui-components/src/__tests__/FieldDefinitionButtons.test.ts

@@ -35,7 +35,12 @@ describe('FieldDefinitionButtons', () => {
 			props: {
 				fieldDefinition: mockFieldDefinition,
 				gui: mockGui,
-				currentStep: 0
+				currentStepIndex: 0,
+				currentStep: {
+					type: 'fields',
+					fieldDefinition: mockFieldDefinition,
+					gui: mockGui
+				}
 			}
 		});
 
@@ -48,7 +53,12 @@ describe('FieldDefinitionButtons', () => {
 			props: {
 				fieldDefinition: mockFieldDefinition,
 				gui: mockGui,
-				currentStep: 0
+				currentStepIndex: 0,
+				currentStep: {
+					type: 'fields',
+					fieldDefinition: mockFieldDefinition,
+					gui: mockGui
+				}
 			}
 		});
 
@@ -62,7 +72,12 @@ describe('FieldDefinitionButtons', () => {
 			props: {
 				fieldDefinition: mockFieldDefinition,
 				gui: mockGui,
-				currentStep: 0
+				currentStepIndex: 0,
+				currentStep: {
+					type: 'fields',
+					fieldDefinition: mockFieldDefinition,
+					gui: mockGui
+				}
 			}
 		});
 
@@ -80,7 +95,12 @@ describe('FieldDefinitionButtons', () => {
 			props: {
 				fieldDefinition: mockFieldDefinition,
 				gui: mockGui,
-				currentStep: 0
+				currentStepIndex: 0,
+				currentStep: {
+					type: 'fields',
+					fieldDefinition: mockFieldDefinition,
+					gui: mockGui
+				}
 			}
 		});
 
@@ -93,7 +113,12 @@ describe('FieldDefinitionButtons', () => {
 			props: {
 				fieldDefinition: mockFieldDefinition,
 				gui: mockGui,
-				currentStep: 0
+				currentStepIndex: 0,
+				currentStep: {
+					type: 'fields',
+					fieldDefinition: mockFieldDefinition,
+					gui: mockGui
+				}
 			}
 		});
 
@@ -118,7 +143,12 @@ describe('FieldDefinitionButtons', () => {
 			props: {
 				fieldDefinition: fastExitFieldDef,
 				gui: mockGui,
-				currentStep: 0
+				currentStepIndex: 0,
+				currentStep: {
+					type: 'fields',
+					fieldDefinition: fastExitFieldDef,
+					gui: mockGui
+				}
 			}
 		});
 

packages/ui-components/src/lib/components/deployment/wizard/DeploymentSteps.svelte

@@ -26,7 +26,6 @@
 	export let inputVaultIds: string[];
 	export let outputVaultIds: string[];
 	export let isLimitStrat: boolean;
-	export let useCustomVaultIds: boolean;
 	export let handleAddOrder: () => Promise<void>;
 	export let tokenInfos: TokenInfos;
 
@@ -74,9 +73,9 @@
 	{:else if currentStep.type === 'deposits'}
 		<DepositButtons {...currentStep} />
 	{:else if currentStep.type === 'tokenInput'}
-		<TokenInputButtons {...currentStep} {useCustomVaultIds} />
+		<TokenInputButtons {...currentStep} />
 	{:else if currentStep.type === 'tokenOutput'}
-		<TokenOutputButtons {...currentStep} {useCustomVaultIds} />
+		<TokenOutputButtons {...currentStep} />
 	{/if}
 
 	<div class="flex justify-between gap-4">

packages/ui-components/src/lib/components/deployment/wizard/TokenInputButtons.svelte

@@ -1,15 +1,12 @@
 <script lang="ts">
 	import { Input } from 'flowbite-svelte';
 	import type { TokenInfos, Vault, DotrainOrderGui } from '@rainlanguage/orderbook/js_api';
-	import type { StepType } from '../../../types/wizardSteps';
 
 	export let i: number;
 	export let input: Vault;
 	export let tokenInfos: TokenInfos;
 	export let inputVaultIds: string[];
 	export let gui: DotrainOrderGui;
-	export let type: StepType;
-	export let useCustomVaultIds: boolean;
 </script>
 
 <div class="flex flex-grow flex-col items-center">

packages/ui-components/src/lib/components/deployment/wizard/TokenOutputButtons.svelte

@@ -1,15 +1,12 @@
 <script lang="ts">
 	import { Label, Input } from 'flowbite-svelte';
 	import type { TokenInfos, Vault, DotrainOrderGui } from '@rainlanguage/orderbook/js_api';
-	import type { StepType } from '../../../types/wizardSteps';
 
 	export let i: number;
 	export let output: Vault;
 	export let tokenInfos: TokenInfos;
 	export let outputVaultIds: string[];
 	export let gui: DotrainOrderGui;
-	export let type: StepType;
-	export let useCustomVaultIds: boolean;
 </script>
 
 <div class="flex items-center gap-2">

packages/ui-components/src/lib/components/deployment/wizard/getDeploymentSteps.ts

@@ -13,6 +13,10 @@ import type {
 } from '@rainlanguage/orderbook/js_api';
 import type { WizardStep } from '../../../types/wizardSteps';
 
+// TODO: Add a check to see if the user has selected to use custom token input/outputs
+// If they have, then we need to add a step to the wizard to allow them to enter the vault ids
+// If they have not, then we can skip this step
+
 export const getDeploymentSteps = (
 	selectTokens: Map<string, string>,
 	isLimitStrat: boolean,

packages/webapp/src/routes/deployment/+page.svelte

@@ -239,9 +239,7 @@
 	{/if}
 
 	{#if allFieldDefinitions.length > 0}
-		<Label class="my-4 whitespace-nowrap border-2 border-red-500 text-2xl underline"
-			>Field Values</Label
-		>
+		<Label class="my-4 whitespace-nowrap text-2xl underline">Field Values</Label>
 		{#each allFieldDefinitions as fieldDefinition}
 			<FieldDefinitionDropdown {fieldDefinition} {gui} />
 		{/each}

packages/webapp/src/routes/deployment/new/+page.svelte

@@ -177,15 +177,13 @@
 		}
 	}
 
-	let useCustomVaultIds = false;
 	let inputVaultIds: string[] = [];
 	let outputVaultIds: string[] = [];
 	function initializeVaultIdArrays() {
 		if (!gui) return;
 		const deployment = gui.getCurrentDeployment();
 		inputVaultIds = new Array(deployment.deployment.order.inputs.length).fill('');
 		outputVaultIds = new Array(deployment.deployment.order.outputs.length).fill('');
-		useCustomVaultIds = false;
 	}
 </script>
 
@@ -226,7 +224,6 @@
 			<DeploymentSteps
 				{gui}
 				{isLimitStrat}
-				{useCustomVaultIds}
 				{inputVaultIds}
 				{outputVaultIds}
 				{handleAddOrder}