Fix conflict and merge main

packages/ui-components/src/lib/components/DropdownProperty.svelte

@@ -0,0 +1,13 @@
+<script lang="ts">
+	export let key: string;
+	export let value: string;
+</script>
+
+<div class="mb-2">
+	<h5 class="text-md w-full tracking-tight text-gray-400 dark:text-gray-400">
+		{key}
+	</h5>
+	<p class="font-regular break-all leading-tight text-gray-800 dark:text-white">
+		{value}
+	</p>
+</div>

packages/ui-components/src/lib/components/IconError.svelte

@@ -0,0 +1,9 @@
+<script lang="ts">
+	import CloseCircleSolid from 'flowbite-svelte-icons/CloseCircleSolid.svelte';
+</script>
+
+<div
+	class="inline-flex h-8 w-8 shrink-0 items-center justify-center rounded-lg bg-red-100 text-red-500 dark:bg-red-800 dark:text-red-200"
+>
+	<CloseCircleSolid class="h-5 w-5" />
+</div>

packages/ui-components/src/lib/index.ts

@@ -32,6 +32,8 @@ export { default as EditableSpan } from './components/EditableSpan.svelte';
 export { default as BlockQuote } from './components/BlockQuote.svelte';
 export { default as Heading } from './components/Heading.svelte';
 export { default as Text } from './components/Text.svelte';
+export { default as DropdownProperty } from './components/DropdownProperty.svelte';
+export { default as IconError } from './components/IconError.svelte';
 export { default as ButtonLoading } from './components/ButtonLoading.svelte';
 
 //Types

tauri-app/src/lib/components/AppToast.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import { Toast } from 'flowbite-svelte';
   import IconSuccess from '$lib/components/IconSuccess.svelte';
-  import IconError from '$lib/components/IconError.svelte';
+  import { IconError } from '@rainlanguage/ui-components';
   import IconWarning from '$lib/components/IconWarning.svelte';
   import IconInfo from '$lib/components/IconInfo.svelte';
   import CloseSolid from 'flowbite-svelte-icons/CloseSolid.svelte';