Merge remote-tracking branch 'origin' into feat-many-fixes

apps/web/src/lib/components/ferias/WizardSolicitacaoFerias.svelte

@@ -116,8 +116,9 @@
 
 			toast.success('Solicitação de férias enviada com sucesso! 🎉');
 			if (onSucesso) onSucesso();
-		} catch (error: any) {
-			toast.error(error.message || 'Erro ao enviar solicitação');
+		} catch (error: unknown) {
+			const errorMessage = error instanceof Error ? error.message : String(error);
+			toast.error(errorMessage || 'Erro ao enviar solicitação');
 		} finally {
 			processando = false;
 		}
@@ -139,7 +140,11 @@
 	<!-- Progress Bar -->
 	<div class="mb-8">
 		<div class="flex items-center justify-between">
+<<<<<<< HEAD
 			{#each Array(totalPassos) as _, i}
+=======
+			{#each Array(totalPassos) as _, i (i)}
+>>>>>>> origin
 				<div class="flex flex-1 items-center">
 					<!-- Círculo do passo -->
 					<div
@@ -211,7 +216,11 @@
 
 				<!-- Seletor de Ano -->
 				<div class="mb-8 grid grid-cols-3 gap-4">
+<<<<<<< HEAD
 					{#each anosDisponiveis as ano}
+=======
+					{#each anosDisponiveis as ano (ano)}
+>>>>>>> origin
 						<button
 							type="button"
 							class="btn btn-lg transition-all duration-300 hover:scale-105"
@@ -451,7 +460,11 @@
 								<div>
 									<p class="font-bold">Erros encontrados:</p>
 									<ul class="list-inside list-disc">
+<<<<<<< HEAD
 										{#each validacao.erros as erro}
+=======
+										{#each validacao.erros as erro (erro)}
+>>>>>>> origin
 											<li>{erro}</li>
 										{/each}
 									</ul>
@@ -477,7 +490,11 @@
 								<div>
 									<p class="font-bold">Avisos:</p>
 									<ul class="list-inside list-disc">
+<<<<<<< HEAD
 										{#each validacao.avisos as aviso}
+=======
+										{#each validacao.avisos as aviso (aviso)}
+>>>>>>> origin
 											<li>{aviso}</li>
 										{/each}
 									</ul>
@@ -519,7 +536,11 @@
 
 						<h4 class="mb-2 text-lg font-bold">Períodos Selecionados:</h4>
 						<div class="space-y-3">
+<<<<<<< HEAD
 							{#each periodosFerias as periodo, index}
+=======
+							{#each periodosFerias as periodo, index (index)}
+>>>>>>> origin
 								<div class="bg-base-200 flex items-center gap-4 rounded-lg p-4">
 									<div
 										class="badge badge-lg badge-primary flex h-12 w-12 items-center justify-center font-bold text-white"
@@ -588,7 +609,11 @@
 					Voltar
 				</button>
 			{:else if onCancelar}
+<<<<<<< HEAD
 				<button type="button" class="btn btn-lg" onclick={onCancelar}> Cancelar </button>
+=======
+				<button type="button" class="btn btn-ghost btn-lg" onclick={onCancelar}> Cancelar </button>
+>>>>>>> origin
 			{/if}
 		</div>