From fb29d62fe242d7a1a46f35c82d3e6f522e81d017 Mon Sep 17 00:00:00 2001
From: brenopolanski <breno.polanski@gmail.com>
Date: Fri, 9 Oct 2020 16:24:12 -0300
Subject: [PATCH 01/13] refactor: filter options in the select dropdown

---
 .../SelectDropdown/SelectDropdown.tsx         | 112 +++++++++++++-----
 .../SelectDropdown/SelectDropdownInput.tsx    |  25 ++++
 src/app/components/SelectDropdown/styles.ts   |   8 +-
 3 files changed, 112 insertions(+), 33 deletions(-)
 mode change 100644 => 100755 src/app/components/SelectDropdown/SelectDropdown.tsx
 create mode 100755 src/app/components/SelectDropdown/SelectDropdownInput.tsx

diff --git a/src/app/components/SelectDropdown/SelectDropdown.tsx b/src/app/components/SelectDropdown/SelectDropdown.tsx
old mode 100644
new mode 100755
index 3804297255..bff6ce1cec
--- a/src/app/components/SelectDropdown/SelectDropdown.tsx
+++ b/src/app/components/SelectDropdown/SelectDropdown.tsx
@@ -1,10 +1,11 @@
 import { useFormField } from "app/components/Form/useFormField";
 import { Icon } from "app/components/Icon";
 import { Input, InputAddonEnd } from "app/components/Input";
-import { useSelect } from "downshift";
-import React, { useEffect, useState } from "react";
+import { SelectDropdownInput } from "app/components/SelectDropdown/SelectDropdownInput";
+import { useCombobox } from "downshift";
+import React, { useEffect, useMemo, useState } from "react";
 
-import { SelectOptionsList, SelectToggleButton } from "./styles";
+import { SelectOptionsList } from "./styles";
 
 type Option = {
 	label: string;
@@ -12,48 +13,75 @@ type Option = {
 };
 
 type SelectProps = {
+	options: Option[];
 	defaultValue?: string;
 	isInvalid?: boolean;
-	disabled?: any;
-	options: Option[];
+	disabled?: boolean;
 	onChange?: (selected: Option) => void;
 } & React.InputHTMLAttributes<any>;
 
 type SelectDropdownProps = {
-	placeholder?: string;
 	options: Option[];
+	placeholder?: string;
 	onSelectedItemChange: any;
 	disabled?: boolean;
 	isInvalid?: boolean;
 	defaultSelectedItem?: Option;
 } & React.InputHTMLAttributes<any>;
 
+export const itemToString = (item: Option | null) => item?.label || "";
+
 const SelectDropdown = ({
-	placeholder,
 	options,
+	placeholder,
 	onSelectedItemChange,
 	disabled,
 	isInvalid,
 	defaultSelectedItem,
 }: SelectDropdownProps) => {
+	const [items, setItems] = useState([...options]);
+
+	const isMatch = (inputValue: string, option: Option) =>
+		inputValue && option.label.toLowerCase().startsWith(inputValue.toLowerCase());
+
 	const {
 		isOpen,
-		selectedItem,
-		selectItem,
-		getToggleButtonProps,
+		closeMenu,
+		openMenu,
+		getComboboxProps,
+		getLabelProps,
+		getInputProps,
+		getItemProps,
 		getMenuProps,
+		selectItem,
+		selectedItem,
+		inputValue,
 		highlightedIndex,
-		getItemProps,
-	} = useSelect<Option>({
-		items: options,
+		reset,
+	} = useCombobox<Option | null>({
+		items,
+		itemToString,
 		onSelectedItemChange,
+		onInputValueChange: ({ inputValue, selectedItem }) => {
+			setItems(inputValue ? options.filter((option: Option) => isMatch(inputValue, option)) : options);
+
+			// Clear selection when user is changing input,
+			// and input does not match previously selected item
+			if (selectedItem && selectedItem.label !== inputValue) {
+				reset();
+			}
+		},
 	});
 
 	useEffect(() => {
-		if (defaultSelectedItem && !selectedItem) {
-			selectItem(defaultSelectedItem);
+		selectItem(defaultSelectedItem || null);
+	}, [selectItem, defaultSelectedItem]);
+
+	const inputTypeAhead = useMemo(() => {
+		if (inputValue && items.length) {
+			return [inputValue, items[0].label.slice(inputValue.length)].join("");
 		}
-	}, [selectItem, selectedItem, defaultSelectedItem]);
+	}, [items, inputValue]);
 
 	const isOpenClassName = isOpen ? "is-open" : "";
 	const isSelectedClassName = selectedItem ? "is-selected" : "";
@@ -62,20 +90,40 @@ const SelectDropdown = ({
 
 	return (
 		<div className="relative w-full cursor-pointer">
-			<div>
-				<SelectToggleButton
-					data-testid="select-list__toggle-button"
-					{...getToggleButtonProps({
-						type: "button",
-						disabled,
-						className: toggleButtonClassName,
+			<div {...getComboboxProps()}>
+				<label {...getLabelProps()} />
+				<SelectDropdownInput
+					suggestion={inputTypeAhead}
+					disabled={disabled}
+					{...getInputProps({
+						placeholder,
+						onFocus: openMenu,
+						onBlur: () => {
+							if (inputValue && items.length > 0) {
+								selectItem(items[0]);
+								closeMenu();
+							} else {
+								reset();
+							}
+						},
+						onKeyDown: (event: any) => {
+							if (event.key === "Tab" || event.key === "Enter") {
+								// Select first match
+								if (inputValue && items.length > 0) {
+									selectItem(items[0]);
+									if (event.key === "Enter") {
+										closeMenu();
+									}
+								}
+								event.preventDefault();
+								return;
+							}
+						},
 					})}
-				>
-					{selectedItem?.label || placeholder}
-				</SelectToggleButton>
+				/>
 				<SelectOptionsList {...getMenuProps({ className: isOpenClassName })}>
 					{isOpen &&
-						options.map((item: Option, index: number) => (
+						items.map((item: Option, index: number) => (
 							<li
 								key={`${item.value}${index}`}
 								data-testid={`select-list__toggle-option-${index}`}
@@ -85,6 +133,10 @@ const SelectDropdown = ({
 									className: `select-list-option ${
 										highlightedIndex === index ? "is-highlighted" : ""
 									}`,
+									onMouseDown: () => {
+										selectItem(item);
+										closeMenu();
+									},
 								})}
 							>
 								<div className="select-list-option__label">{item.label}</div>
@@ -124,7 +176,7 @@ export const Select = React.forwardRef<HTMLInputElement, SelectProps>(
 					defaultSelectedItem={defaultSelectedItem}
 					placeholder={placeholder}
 					isInvalid={isInvalidField}
-					onSelectedItemChange={({ selectedItem }: any) => {
+					onSelectedItemChange={({ selectedItem }: { selectedItem: Option }) => {
 						setSelected(selectedItem);
 						onChange?.(selectedItem);
 					}}
@@ -136,6 +188,8 @@ export const Select = React.forwardRef<HTMLInputElement, SelectProps>(
 
 Select.displayName = "Select";
 Select.defaultProps = {
-	defaultValue: "",
 	options: [],
+	defaultValue: "",
+	placeholder: "Select option",
+	disabled: false,
 };
diff --git a/src/app/components/SelectDropdown/SelectDropdownInput.tsx b/src/app/components/SelectDropdown/SelectDropdownInput.tsx
new file mode 100755
index 0000000000..ab3e60b119
--- /dev/null
+++ b/src/app/components/SelectDropdown/SelectDropdownInput.tsx
@@ -0,0 +1,25 @@
+import { Input, InputAddon, InputGroup } from "app/components/Input";
+import React from "react";
+
+type Props = {
+	suggestion?: string;
+} & React.InputHTMLAttributes<any>;
+
+const TypeAhead = ({ value }: { value?: string }) => (
+	<InputAddon
+		as="span"
+		data-testid="SelectDropdownInput__typeahead"
+		className="py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+	>
+		{value}
+	</InputAddon>
+);
+
+export const SelectDropdownInput = React.forwardRef<HTMLInputElement, Props>(({ suggestion, ...props }: Props, ref) => (
+	<InputGroup data-testid="SelectDropdownInput">
+		{suggestion && <TypeAhead value={suggestion} />}
+		<Input data-testid="SelectDropdownInput__input" ref={ref} {...props} />
+	</InputGroup>
+));
+
+SelectDropdownInput.displayName = "SelectDropdownInput";
diff --git a/src/app/components/SelectDropdown/styles.ts b/src/app/components/SelectDropdown/styles.ts
index ab02153849..468a9bbd82 100644
--- a/src/app/components/SelectDropdown/styles.ts
+++ b/src/app/components/SelectDropdown/styles.ts
@@ -3,7 +3,7 @@ import tw, { styled } from "twin.macro";
 export const SelectToggleButton = styled.button`
 	& {
 		min-height: 50px;
-		${tw`outline-none text-left w-full inline-block bg-theme-background appearance-none rounded border py-3 px-4 transition-colors duration-200 outline-none text-theme-neutral pr-12`}
+		${tw`inline-block w-full px-4 py-3 pr-12 text-left transition-colors duration-200 border rounded outline-none appearance-none bg-theme-background text-theme-neutral`}
 		${tw`border-theme-neutral-300`}
 	}
 
@@ -34,11 +34,11 @@ export const SelectToggleButton = styled.button`
 
 export const SelectOptionsList = styled.ul`
 	& {
-		${tw`absolute w-full z-10 top-14 rounded-lg shadow-xl bg-white outline-none`}
+		${tw`absolute z-10 w-full bg-white rounded-lg shadow-xl outline-none top-14`}
 	}
 
 	&.is-open {
-		${tw`py-6 max-h-128 overflow-y-auto`}
+		${tw`py-6 overflow-y-auto max-h-128`}
 	}
 
 	.select-list-option {
@@ -55,7 +55,7 @@ export const SelectOptionsList = styled.ul`
 		}
 
 		&.is-highlighted {
-			${tw`bg-theme-neutral-contrast -mt-px`};
+			${tw`-mt-px bg-theme-neutral-contrast`};
 			padding-top: 1px;
 
 			&:last-child {

From efa99319f8f8a6bb415bebcc31081683bc2fbbf8 Mon Sep 17 00:00:00 2001
From: brenopolanski <breno.polanski@gmail.com>
Date: Tue, 13 Oct 2020 10:27:37 -0300
Subject: [PATCH 02/13] refactor: shows all options when the input is focused

---
 .../SelectDropdown/SelectDropdown.tsx         | 33 ++++++++-----------
 src/app/components/SelectDropdown/styles.ts   | 33 +------------------
 2 files changed, 15 insertions(+), 51 deletions(-)

diff --git a/src/app/components/SelectDropdown/SelectDropdown.tsx b/src/app/components/SelectDropdown/SelectDropdown.tsx
index bff6ce1cec..009d0f661d 100755
--- a/src/app/components/SelectDropdown/SelectDropdown.tsx
+++ b/src/app/components/SelectDropdown/SelectDropdown.tsx
@@ -22,22 +22,21 @@ type SelectProps = {
 
 type SelectDropdownProps = {
 	options: Option[];
+	defaultSelectedItem?: Option;
 	placeholder?: string;
-	onSelectedItemChange: any;
-	disabled?: boolean;
 	isInvalid?: boolean;
-	defaultSelectedItem?: Option;
+	disabled?: boolean;
+	onSelectedItemChange: any;
 } & React.InputHTMLAttributes<any>;
 
 export const itemToString = (item: Option | null) => item?.label || "";
 
 const SelectDropdown = ({
 	options,
+	defaultSelectedItem,
 	placeholder,
-	onSelectedItemChange,
 	disabled,
-	isInvalid,
-	defaultSelectedItem,
+	onSelectedItemChange,
 }: SelectDropdownProps) => {
 	const [items, setItems] = useState([...options]);
 
@@ -54,7 +53,6 @@ const SelectDropdown = ({
 		getItemProps,
 		getMenuProps,
 		selectItem,
-		selectedItem,
 		inputValue,
 		highlightedIndex,
 		reset,
@@ -83,11 +81,6 @@ const SelectDropdown = ({
 		}
 	}, [items, inputValue]);
 
-	const isOpenClassName = isOpen ? "is-open" : "";
-	const isSelectedClassName = selectedItem ? "is-selected" : "";
-	const isInvalidClassName = isInvalid ? "is-invalid" : "";
-	const toggleButtonClassName = `${isOpenClassName} ${isSelectedClassName} ${isInvalidClassName}`;
-
 	return (
 		<div className="relative w-full cursor-pointer">
 			<div {...getComboboxProps()}>
@@ -106,7 +99,7 @@ const SelectDropdown = ({
 								reset();
 							}
 						},
-						onKeyDown: (event: any) => {
+						onKeyDown: (event) => {
 							if (event.key === "Tab" || event.key === "Enter") {
 								// Select first match
 								if (inputValue && items.length > 0) {
@@ -121,17 +114,19 @@ const SelectDropdown = ({
 						},
 					})}
 				/>
-				<SelectOptionsList {...getMenuProps({ className: isOpenClassName })}>
+				<SelectOptionsList {...getMenuProps({ className: isOpen ? "is-open" : "" })}>
 					{isOpen &&
-						items.map((item: Option, index: number) => (
+						options.map((item: Option, index: number) => (
 							<li
 								key={`${item.value}${index}`}
 								data-testid={`select-list__toggle-option-${index}`}
 								{...getItemProps({
-									item,
 									index,
+									item,
 									className: `select-list-option ${
-										highlightedIndex === index ? "is-highlighted" : ""
+										item.label === inputValue || (!inputValue && highlightedIndex === index)
+											? "is-highlighted"
+											: ""
 									}`,
 									onMouseDown: () => {
 										selectItem(item);
@@ -152,7 +147,7 @@ const SelectDropdown = ({
 };
 
 export const Select = React.forwardRef<HTMLInputElement, SelectProps>(
-	({ isInvalid, placeholder, onChange, defaultValue, options, disabled }: SelectProps, ref) => {
+	({ options, defaultValue, placeholder, isInvalid, disabled, onChange }: SelectProps, ref) => {
 		const defaultSelectedItem = options.find((option: Option) => option.value === defaultValue);
 		const [selected, setSelected] = useState(defaultSelectedItem);
 
@@ -167,8 +162,8 @@ export const Select = React.forwardRef<HTMLInputElement, SelectProps>(
 					ref={ref}
 					value={selected?.value || ""}
 					className="sr-only"
-					readOnly
 					isInvalid={isInvalidField}
+					readOnly
 				/>
 				<SelectDropdown
 					disabled={disabled}
diff --git a/src/app/components/SelectDropdown/styles.ts b/src/app/components/SelectDropdown/styles.ts
index 468a9bbd82..56bbe2f6ef 100644
--- a/src/app/components/SelectDropdown/styles.ts
+++ b/src/app/components/SelectDropdown/styles.ts
@@ -1,37 +1,5 @@
 import tw, { styled } from "twin.macro";
 
-export const SelectToggleButton = styled.button`
-	& {
-		min-height: 50px;
-		${tw`inline-block w-full px-4 py-3 pr-12 text-left transition-colors duration-200 border rounded outline-none appearance-none bg-theme-background text-theme-neutral`}
-		${tw`border-theme-neutral-300`}
-	}
-
-	&:focus {
-		${tw`outline-none`}
-	}
-
-	&:disabled {
-		${tw`border-theme-neutral-300 bg-theme-neutral-contrast text-theme-neutral-dark`}
-	}
-
-	&.is-open {
-		${tw`border-theme-primary`}
-		box-shadow: 0 0 0 1px var(--theme-color-primary);
-	}
-
-	&.is-invalid {
-		${tw`border-theme-danger`}
-		&.is-open {
-			box-shadow: 0 0 0 1px var(--theme-color-danger);
-		}
-	}
-
-	&.is-selected {
-		${tw`text-theme-neutral-900`}
-	}
-`;
-
 export const SelectOptionsList = styled.ul`
 	& {
 		${tw`absolute z-10 w-full bg-white rounded-lg shadow-xl outline-none top-14`}
@@ -54,6 +22,7 @@ export const SelectOptionsList = styled.ul`
 			}
 		}
 
+		&:hover,
 		&.is-highlighted {
 			${tw`-mt-px bg-theme-neutral-contrast`};
 			padding-top: 1px;

From 52594f4a811893a55d8d73e1695e26efd844f957 Mon Sep 17 00:00:00 2001
From: brenopolanski <breno.polanski@gmail.com>
Date: Tue, 13 Oct 2020 13:33:21 -0300
Subject: [PATCH 03/13] refactor: show options if the input is empty

---
 .../SelectDropdown/SelectDropdown.tsx          | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/app/components/SelectDropdown/SelectDropdown.tsx b/src/app/components/SelectDropdown/SelectDropdown.tsx
index 009d0f661d..fc493da8c0 100755
--- a/src/app/components/SelectDropdown/SelectDropdown.tsx
+++ b/src/app/components/SelectDropdown/SelectDropdown.tsx
@@ -39,6 +39,7 @@ const SelectDropdown = ({
 	onSelectedItemChange,
 }: SelectDropdownProps) => {
 	const [items, setItems] = useState([...options]);
+	const [isTyping, setIsTyping] = useState(false);
 
 	const isMatch = (inputValue: string, option: Option) =>
 		inputValue && option.label.toLowerCase().startsWith(inputValue.toLowerCase());
@@ -60,9 +61,19 @@ const SelectDropdown = ({
 		items,
 		itemToString,
 		onSelectedItemChange,
-		onInputValueChange: ({ inputValue, selectedItem }) => {
+		onInputValueChange: ({ inputValue, selectedItem, type }) => {
 			setItems(inputValue ? options.filter((option: Option) => isMatch(inputValue, option)) : options);
 
+			if (type === "__input_change__") {
+				setIsTyping(true);
+			} else {
+				setIsTyping(false);
+			}
+
+			if (!inputValue) {
+				openMenu();
+			}
+
 			// Clear selection when user is changing input,
 			// and input does not match previously selected item
 			if (selectedItem && selectedItem.label !== inputValue) {
@@ -81,6 +92,8 @@ const SelectDropdown = ({
 		}
 	}, [items, inputValue]);
 
+	const data = isTyping ? items : options;
+
 	return (
 		<div className="relative w-full cursor-pointer">
 			<div {...getComboboxProps()}>
@@ -90,6 +103,7 @@ const SelectDropdown = ({
 					disabled={disabled}
 					{...getInputProps({
 						placeholder,
+						className: "cursor-default",
 						onFocus: openMenu,
 						onBlur: () => {
 							if (inputValue && items.length > 0) {
@@ -116,7 +130,7 @@ const SelectDropdown = ({
 				/>
 				<SelectOptionsList {...getMenuProps({ className: isOpen ? "is-open" : "" })}>
 					{isOpen &&
-						options.map((item: Option, index: number) => (
+						data.map((item: Option, index: number) => (
 							<li
 								key={`${item.value}${index}`}
 								data-testid={`select-list__toggle-option-${index}`}

From 080a6793e69ad362450f41f73c62727a8794956b Mon Sep 17 00:00:00 2001
From: brenopolanski <breno.polanski@gmail.com>
Date: Tue, 13 Oct 2020 14:07:39 -0300
Subject: [PATCH 04/13] feat: show message no options

---
 .../SelectDropdown/SelectDropdown.tsx         | 44 +++++++++++--------
 src/app/components/SelectDropdown/styles.ts   |  6 +++
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/src/app/components/SelectDropdown/SelectDropdown.tsx b/src/app/components/SelectDropdown/SelectDropdown.tsx
index fc493da8c0..255f752aa8 100755
--- a/src/app/components/SelectDropdown/SelectDropdown.tsx
+++ b/src/app/components/SelectDropdown/SelectDropdown.tsx
@@ -130,25 +130,31 @@ const SelectDropdown = ({
 				/>
 				<SelectOptionsList {...getMenuProps({ className: isOpen ? "is-open" : "" })}>
 					{isOpen &&
-						data.map((item: Option, index: number) => (
-							<li
-								key={`${item.value}${index}`}
-								data-testid={`select-list__toggle-option-${index}`}
-								{...getItemProps({
-									index,
-									item,
-									className: `select-list-option ${
-										item.label === inputValue || (!inputValue && highlightedIndex === index)
-											? "is-highlighted"
-											: ""
-									}`,
-									onMouseDown: () => {
-										selectItem(item);
-										closeMenu();
-									},
-								})}
-							>
-								<div className="select-list-option__label">{item.label}</div>
+						(data.length > 0 ? (
+							data.map((item: Option, index: number) => (
+								<li
+									key={`${item.value}${index}`}
+									data-testid={`select-list__toggle-option-${index}`}
+									{...getItemProps({
+										index,
+										item,
+										className: `select-list-option ${
+											item.label === inputValue || (!inputValue && highlightedIndex === index)
+												? "is-highlighted"
+												: ""
+										}`,
+										onMouseDown: () => {
+											selectItem(item);
+											closeMenu();
+										},
+									})}
+								>
+									<div className="select-list-option__label">{item.label}</div>
+								</li>
+							))
+						) : (
+							<li className="select-list-option is-empty" data-testid="select-list__empty-option">
+								No Options
 							</li>
 						))}
 				</SelectOptionsList>
diff --git a/src/app/components/SelectDropdown/styles.ts b/src/app/components/SelectDropdown/styles.ts
index 56bbe2f6ef..424e322fd1 100644
--- a/src/app/components/SelectDropdown/styles.ts
+++ b/src/app/components/SelectDropdown/styles.ts
@@ -35,5 +35,11 @@ export const SelectOptionsList = styled.ul`
 				${tw`border-b border-theme-neutral-contrast`};
 			}
 		}
+
+		&.is-empty {
+			&:hover {
+				${tw`bg-white cursor-default`}
+			}
+		}
 	}
 `;

From 95283d1914a064756ab48c4100e66ef28b4badbe Mon Sep 17 00:00:00 2001
From: brenopolanski <breno.polanski@gmail.com>
Date: Tue, 13 Oct 2020 14:13:09 -0300
Subject: [PATCH 05/13] chore: add i18n

---
 src/app/components/SelectDropdown/SelectDropdown.tsx | 5 ++++-
 src/app/i18n/common/i18n.ts                          | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/app/components/SelectDropdown/SelectDropdown.tsx b/src/app/components/SelectDropdown/SelectDropdown.tsx
index 255f752aa8..103ec6760d 100755
--- a/src/app/components/SelectDropdown/SelectDropdown.tsx
+++ b/src/app/components/SelectDropdown/SelectDropdown.tsx
@@ -4,6 +4,7 @@ import { Input, InputAddonEnd } from "app/components/Input";
 import { SelectDropdownInput } from "app/components/SelectDropdown/SelectDropdownInput";
 import { useCombobox } from "downshift";
 import React, { useEffect, useMemo, useState } from "react";
+import { useTranslation } from "react-i18next";
 
 import { SelectOptionsList } from "./styles";
 
@@ -38,6 +39,8 @@ const SelectDropdown = ({
 	disabled,
 	onSelectedItemChange,
 }: SelectDropdownProps) => {
+	const { t } = useTranslation();
+
 	const [items, setItems] = useState([...options]);
 	const [isTyping, setIsTyping] = useState(false);
 
@@ -154,7 +157,7 @@ const SelectDropdown = ({
 							))
 						) : (
 							<li className="select-list-option is-empty" data-testid="select-list__empty-option">
-								No Options
+								{t("COMMON.NO_OPTIONS")}
 							</li>
 						))}
 				</SelectOptionsList>
diff --git a/src/app/i18n/common/i18n.ts b/src/app/i18n/common/i18n.ts
index 8d1f29d1d5..d3cbf750b1 100644
--- a/src/app/i18n/common/i18n.ts
+++ b/src/app/i18n/common/i18n.ts
@@ -89,6 +89,7 @@ export const translations: { [key: string]: any } = {
 	MOST_POPULAR: "Most popular",
 	MULTISIGNATURE: "Multisignature",
 	NAME: "Name",
+	NO_OPTIONS: "No Options",
 	SENDER_ADDRESS: "Sender address",
 	SMARTBRIDGE: "Smartbridge",
 	FEE: "FEE",

From 1babb23cf4ee4456b3c0aad7c0b9706400f9eabd Mon Sep 17 00:00:00 2001
From: brenopolanski <breno.polanski@gmail.com>
Date: Tue, 13 Oct 2020 14:41:05 -0300
Subject: [PATCH 06/13] test: update snapshots

---
 src/app/__snapshots__/App.test.tsx.snap       |  20 +-
 .../SelectDropdown/SelectDropdown.stories.tsx |  10 +-
 .../SelectDropdown.test.tsx.snap              | 297 +++++++++----
 src/app/i18n/common/i18n.ts                   |   2 +-
 .../__snapshots__/Transactions.test.tsx.snap  |   2 +-
 .../__snapshots__/Dashboard.test.tsx.snap     |  14 +-
 .../__snapshots__/ContactUs.test.tsx.snap     |  44 +-
 .../__snapshots__/CreateProfile.test.tsx.snap |  44 +-
 .../__snapshots__/Settings.test.tsx.snap      | 418 ++++++++++++------
 .../EntityRegistrationForm.test.tsx.snap      | 136 +++---
 .../LinkCollection.test.tsx.snap              |  94 ++--
 .../SendEntityRegistration.test.tsx.snap      | 132 ++++--
 .../SendEntityUpdate.test.tsx.snap            |  54 +--
 13 files changed, 817 insertions(+), 450 deletions(-)

diff --git a/src/app/__snapshots__/App.test.tsx.snap b/src/app/__snapshots__/App.test.tsx.snap
index 120278128a..c191e58feb 100644
--- a/src/app/__snapshots__/App.test.tsx.snap
+++ b/src/app/__snapshots__/App.test.tsx.snap
@@ -10,7 +10,7 @@ exports[`App should close splash screen if not demo 1`] = `
       class="Toastify"
     />
     <div
-      class="sc-fznLxA kCDRyF"
+      class="sc-fznyYp ePFTkY"
       data-testid="RouterView__wrapper"
     >
       <div
@@ -137,7 +137,7 @@ exports[`App should render mock 1`] = `
       class="Toastify"
     />
     <div
-      class="sc-fznLxA kCDRyF"
+      class="sc-fznyYp ePFTkY"
       data-testid="RouterView__wrapper"
     >
       <div
@@ -257,7 +257,7 @@ exports[`App should render mock 1`] = `
                                 data-testid="profile-card__user--name"
                               >
                                 <span
-                                  class="sc-fzoydu eoIiNI"
+                                  class="sc-fzqMAW dOgzZx"
                                 >
                                   John Doe
                                 </span>
@@ -349,7 +349,7 @@ exports[`App should render mock 1`] = `
                                 data-testid="profile-card__user--name"
                               >
                                 <span
-                                  class="sc-fzoydu eoIiNI"
+                                  class="sc-fzqMAW dOgzZx"
                                 >
                                   Jane Doe
                                 </span>
@@ -451,7 +451,7 @@ exports[`App should render splash screen 1`] = `
       class="Toastify"
     />
     <div
-      class="sc-fznLxA kCDRyF"
+      class="sc-fznyYp ePFTkY"
       data-testid="RouterView__wrapper"
     >
       <div
@@ -571,7 +571,7 @@ exports[`App should render splash screen 1`] = `
                                 data-testid="profile-card__user--name"
                               >
                                 <span
-                                  class="sc-fzoydu eoIiNI"
+                                  class="sc-fzqMAW dOgzZx"
                                 >
                                   John Doe
                                 </span>
@@ -663,7 +663,7 @@ exports[`App should render splash screen 1`] = `
                                 data-testid="profile-card__user--name"
                               >
                                 <span
-                                  class="sc-fzoydu eoIiNI"
+                                  class="sc-fzqMAW dOgzZx"
                                 >
                                   Jane Doe
                                 </span>
@@ -842,7 +842,7 @@ exports[`App should render welcome screen after splash screen 1`] = `
       class="Toastify"
     />
     <div
-      class="sc-fznLxA kCDRyF"
+      class="sc-fznyYp ePFTkY"
       data-testid="RouterView__wrapper"
     >
       <div
@@ -962,7 +962,7 @@ exports[`App should render welcome screen after splash screen 1`] = `
                                 data-testid="profile-card__user--name"
                               >
                                 <span
-                                  class="sc-fzoydu eoIiNI"
+                                  class="sc-fzqMAW dOgzZx"
                                 >
                                   John Doe
                                 </span>
@@ -1054,7 +1054,7 @@ exports[`App should render welcome screen after splash screen 1`] = `
                                 data-testid="profile-card__user--name"
                               >
                                 <span
-                                  class="sc-fzoydu eoIiNI"
+                                  class="sc-fzqMAW dOgzZx"
                                 >
                                   Jane Doe
                                 </span>
diff --git a/src/app/components/SelectDropdown/SelectDropdown.stories.tsx b/src/app/components/SelectDropdown/SelectDropdown.stories.tsx
index 0af6c0e57a..4403acb35a 100644
--- a/src/app/components/SelectDropdown/SelectDropdown.stories.tsx
+++ b/src/app/components/SelectDropdown/SelectDropdown.stories.tsx
@@ -21,16 +21,18 @@ export const Dropdown = () => {
 			value: "3",
 		},
 	];
+
 	return (
 		<div className="max-w-xs space-y-4">
-			<Select placeholder="Select option" options={options} />
-			<Select placeholder="Invalid" isInvalid options={options} />
-			<Select placeholder="Disabled" disabled options={options} />
+			<Select options={options} placeholder="Select option" />
+			<Select options={options} placeholder="Invalid" isInvalid />
+			<Select options={options} placeholder="Disabled" disabled />
+
 			<div className="mt-4">With default value</div>
 			<Select placeholder="Disabled" options={options} defaultValue="3" />
 
 			<div className="mt-4">With default value (disabled)</div>
-			<Select placeholder="Disabled" disabled options={options} defaultValue="3" />
+			<Select options={options} defaultValue="3" placeholder="Disabled" disabled />
 		</div>
 	);
 };
diff --git a/src/app/components/SelectDropdown/__snapshots__/SelectDropdown.test.tsx.snap b/src/app/components/SelectDropdown/__snapshots__/SelectDropdown.test.tsx.snap
index 57a67ffdb2..85111992e2 100644
--- a/src/app/components/SelectDropdown/__snapshots__/SelectDropdown.test.tsx.snap
+++ b/src/app/components/SelectDropdown/__snapshots__/SelectDropdown.test.tsx.snap
@@ -15,22 +15,37 @@ exports[`SelectDropdown should render 1`] = `
     <div
       class="relative w-full cursor-pointer"
     >
-      <div>
-        <button
-          aria-expanded="false"
-          aria-haspopup="listbox"
-          aria-labelledby="downshift-0-label downshift-0-toggle-button"
-          class="sc-fzozJi hEMsew   "
-          data-testid="select-list__toggle-button"
-          id="downshift-0-toggle-button"
-          type="button"
+      <div
+        aria-expanded="false"
+        aria-haspopup="listbox"
+        aria-owns="downshift-1-menu"
+        role="combobox"
+      >
+        <label
+          for="downshift-0-input"
+          id="downshift-1-label"
         />
+        <div
+          class="sc-AxgMl cZbWSE"
+          data-testid="SelectDropdownInput"
+        >
+          <input
+            aria-autocomplete="list"
+            aria-controls="downshift-1-menu"
+            aria-labelledby="downshift-1-label"
+            autocomplete="off"
+            class="sc-AxirZ cNbglv overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+            data-testid="SelectDropdownInput__input"
+            id="downshift-0-input"
+            placeholder="Select option"
+            value=""
+          />
+        </div>
         <ul
-          aria-labelledby="downshift-0-label"
-          class="sc-fzoLsD XSmGT"
-          id="downshift-0-menu"
+          aria-labelledby="downshift-1-label"
+          class="sc-fzozJi hiAEj"
+          id="downshift-1-menu"
           role="listbox"
-          tabindex="-1"
         />
       </div>
       <div
@@ -66,23 +81,38 @@ exports[`SelectDropdown should render disabled 1`] = `
     <div
       class="relative w-full cursor-pointer"
     >
-      <div>
-        <button
-          aria-expanded="false"
-          aria-haspopup="listbox"
-          aria-labelledby="downshift-2-label downshift-2-toggle-button"
-          class="sc-fzozJi hEMsew   "
-          data-testid="select-list__toggle-button"
-          disabled=""
-          id="downshift-2-toggle-button"
-          type="button"
+      <div
+        aria-expanded="false"
+        aria-haspopup="listbox"
+        aria-owns="downshift-9-menu"
+        role="combobox"
+      >
+        <label
+          for="downshift-8-input"
+          id="downshift-9-label"
         />
+        <div
+          class="sc-AxgMl cZbWSE"
+          data-testid="SelectDropdownInput"
+        >
+          <input
+            aria-autocomplete="list"
+            aria-controls="downshift-9-menu"
+            aria-labelledby="downshift-9-label"
+            autocomplete="off"
+            class="sc-AxirZ cNbglv overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+            data-testid="SelectDropdownInput__input"
+            disabled=""
+            id="downshift-8-input"
+            placeholder="Select option"
+            value=""
+          />
+        </div>
         <ul
-          aria-labelledby="downshift-2-label"
-          class="sc-fzoLsD XSmGT"
-          id="downshift-2-menu"
+          aria-labelledby="downshift-9-label"
+          class="sc-fzozJi hiAEj"
+          id="downshift-9-menu"
           role="listbox"
-          tabindex="-1"
         />
       </div>
       <div
@@ -119,22 +149,37 @@ exports[`SelectDropdown should render invalid 1`] = `
     <div
       class="relative w-full cursor-pointer"
     >
-      <div>
-        <button
-          aria-expanded="false"
-          aria-haspopup="listbox"
-          aria-labelledby="downshift-1-label downshift-1-toggle-button"
-          class="sc-fzozJi hEMsew   is-invalid"
-          data-testid="select-list__toggle-button"
-          id="downshift-1-toggle-button"
-          type="button"
+      <div
+        aria-expanded="false"
+        aria-haspopup="listbox"
+        aria-owns="downshift-5-menu"
+        role="combobox"
+      >
+        <label
+          for="downshift-4-input"
+          id="downshift-5-label"
         />
+        <div
+          class="sc-AxgMl cZbWSE"
+          data-testid="SelectDropdownInput"
+        >
+          <input
+            aria-autocomplete="list"
+            aria-controls="downshift-5-menu"
+            aria-labelledby="downshift-5-label"
+            autocomplete="off"
+            class="sc-AxirZ cNbglv overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+            data-testid="SelectDropdownInput__input"
+            id="downshift-4-input"
+            placeholder="Select option"
+            value=""
+          />
+        </div>
         <ul
-          aria-labelledby="downshift-1-label"
-          class="sc-fzoLsD XSmGT"
-          id="downshift-1-menu"
+          aria-labelledby="downshift-5-label"
+          class="sc-fzozJi hiAEj"
+          id="downshift-5-menu"
           role="listbox"
-          tabindex="-1"
         />
       </div>
       <div
@@ -170,22 +215,37 @@ exports[`SelectDropdown should render with empty options 1`] = `
     <div
       class="relative w-full cursor-pointer"
     >
-      <div>
-        <button
-          aria-expanded="false"
-          aria-haspopup="listbox"
-          aria-labelledby="downshift-6-label downshift-6-toggle-button"
-          class="sc-fzozJi hEMsew   "
-          data-testid="select-list__toggle-button"
-          id="downshift-6-toggle-button"
-          type="button"
+      <div
+        aria-expanded="false"
+        aria-haspopup="listbox"
+        aria-owns="downshift-23-menu"
+        role="combobox"
+      >
+        <label
+          for="downshift-22-input"
+          id="downshift-23-label"
         />
+        <div
+          class="sc-AxgMl cZbWSE"
+          data-testid="SelectDropdownInput"
+        >
+          <input
+            aria-autocomplete="list"
+            aria-controls="downshift-23-menu"
+            aria-labelledby="downshift-23-label"
+            autocomplete="off"
+            class="sc-AxirZ cNbglv overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+            data-testid="SelectDropdownInput__input"
+            id="downshift-22-input"
+            placeholder="Select option"
+            value=""
+          />
+        </div>
         <ul
-          aria-labelledby="downshift-6-label"
-          class="sc-fzoLsD XSmGT"
-          id="downshift-6-menu"
+          aria-labelledby="downshift-23-label"
+          class="sc-fzozJi hiAEj"
+          id="downshift-23-menu"
           role="listbox"
-          tabindex="-1"
         />
       </div>
       <div
@@ -221,24 +281,43 @@ exports[`SelectDropdown should render with initial default value 1`] = `
     <div
       class="relative w-full cursor-pointer"
     >
-      <div>
-        <button
-          aria-expanded="false"
-          aria-haspopup="listbox"
-          aria-labelledby="downshift-3-label downshift-3-toggle-button"
-          class="sc-fzozJi hEMsew  is-selected "
-          data-testid="select-list__toggle-button"
-          id="downshift-3-toggle-button"
-          type="button"
+      <div
+        aria-expanded="false"
+        aria-haspopup="listbox"
+        aria-owns="downshift-13-menu"
+        role="combobox"
+      >
+        <label
+          for="downshift-12-input"
+          id="downshift-13-label"
+        />
+        <div
+          class="sc-AxgMl cZbWSE"
+          data-testid="SelectDropdownInput"
         >
-          Option 3
-        </button>
+          <span
+            class="sc-AxiKw isrMEQ py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+            data-testid="SelectDropdownInput__typeahead"
+          >
+            Option 3
+          </span>
+          <input
+            aria-autocomplete="list"
+            aria-controls="downshift-13-menu"
+            aria-labelledby="downshift-13-label"
+            autocomplete="off"
+            class="sc-AxirZ cNbglv overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+            data-testid="SelectDropdownInput__input"
+            id="downshift-12-input"
+            placeholder="Select option"
+            value="Option 3"
+          />
+        </div>
         <ul
-          aria-labelledby="downshift-3-label"
-          class="sc-fzoLsD XSmGT"
-          id="downshift-3-menu"
+          aria-labelledby="downshift-13-label"
+          class="sc-fzozJi hiAEj"
+          id="downshift-13-menu"
           role="listbox"
-          tabindex="-1"
         />
       </div>
       <div
@@ -274,22 +353,37 @@ exports[`SelectDropdown should render with options values as numbers 1`] = `
     <div
       class="relative w-full cursor-pointer"
     >
-      <div>
-        <button
-          aria-expanded="false"
-          aria-haspopup="listbox"
-          aria-labelledby="downshift-7-label downshift-7-toggle-button"
-          class="sc-fzozJi hEMsew   "
-          data-testid="select-list__toggle-button"
-          id="downshift-7-toggle-button"
-          type="button"
+      <div
+        aria-expanded="false"
+        aria-haspopup="listbox"
+        aria-owns="downshift-27-menu"
+        role="combobox"
+      >
+        <label
+          for="downshift-26-input"
+          id="downshift-27-label"
         />
+        <div
+          class="sc-AxgMl cZbWSE"
+          data-testid="SelectDropdownInput"
+        >
+          <input
+            aria-autocomplete="list"
+            aria-controls="downshift-27-menu"
+            aria-labelledby="downshift-27-label"
+            autocomplete="off"
+            class="sc-AxirZ cNbglv overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+            data-testid="SelectDropdownInput__input"
+            id="downshift-26-input"
+            placeholder="Select option"
+            value=""
+          />
+        </div>
         <ul
-          aria-labelledby="downshift-7-label"
-          class="sc-fzoLsD XSmGT"
-          id="downshift-7-menu"
+          aria-labelledby="downshift-27-label"
+          class="sc-fzozJi hiAEj"
+          id="downshift-27-menu"
           role="listbox"
-          tabindex="-1"
         />
       </div>
       <div
@@ -325,22 +419,37 @@ exports[`SelectDropdown should render with wrong default value 1`] = `
     <div
       class="relative w-full cursor-pointer"
     >
-      <div>
-        <button
-          aria-expanded="false"
-          aria-haspopup="listbox"
-          aria-labelledby="downshift-5-label downshift-5-toggle-button"
-          class="sc-fzozJi hEMsew   "
-          data-testid="select-list__toggle-button"
-          id="downshift-5-toggle-button"
-          type="button"
+      <div
+        aria-expanded="false"
+        aria-haspopup="listbox"
+        aria-owns="downshift-19-menu"
+        role="combobox"
+      >
+        <label
+          for="downshift-18-input"
+          id="downshift-19-label"
         />
+        <div
+          class="sc-AxgMl cZbWSE"
+          data-testid="SelectDropdownInput"
+        >
+          <input
+            aria-autocomplete="list"
+            aria-controls="downshift-19-menu"
+            aria-labelledby="downshift-19-label"
+            autocomplete="off"
+            class="sc-AxirZ cNbglv overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+            data-testid="SelectDropdownInput__input"
+            id="downshift-18-input"
+            placeholder="Select option"
+            value=""
+          />
+        </div>
         <ul
-          aria-labelledby="downshift-5-label"
-          class="sc-fzoLsD XSmGT"
-          id="downshift-5-menu"
+          aria-labelledby="downshift-19-label"
+          class="sc-fzozJi hiAEj"
+          id="downshift-19-menu"
           role="listbox"
-          tabindex="-1"
         />
       </div>
       <div
diff --git a/src/app/i18n/common/i18n.ts b/src/app/i18n/common/i18n.ts
index d3cbf750b1..4eed17fd73 100644
--- a/src/app/i18n/common/i18n.ts
+++ b/src/app/i18n/common/i18n.ts
@@ -89,7 +89,7 @@ export const translations: { [key: string]: any } = {
 	MOST_POPULAR: "Most popular",
 	MULTISIGNATURE: "Multisignature",
 	NAME: "Name",
-	NO_OPTIONS: "No Options",
+	NO_OPTIONS: "No options",
 	SENDER_ADDRESS: "Sender address",
 	SMARTBRIDGE: "Smartbridge",
 	FEE: "FEE",
diff --git a/src/domains/dashboard/components/Transactions/__snapshots__/Transactions.test.tsx.snap b/src/domains/dashboard/components/Transactions/__snapshots__/Transactions.test.tsx.snap
index c471a15d23..b1ab0d8e3d 100644
--- a/src/domains/dashboard/components/Transactions/__snapshots__/Transactions.test.tsx.snap
+++ b/src/domains/dashboard/components/Transactions/__snapshots__/Transactions.test.tsx.snap
@@ -793,7 +793,7 @@ exports[`Transactions should render with with transactions 1`] = `
         </div>
       </div>
       <button
-        class="sc-AxjAm fPpool w-full mt-10 mb-5"
+        class="sc-AxjAm hXnHfM w-full mt-10 mb-5"
         color="primary"
         data-testid="transactions__fetch-more-button"
         type="button"
diff --git a/src/domains/dashboard/pages/Dashboard/__snapshots__/Dashboard.test.tsx.snap b/src/domains/dashboard/pages/Dashboard/__snapshots__/Dashboard.test.tsx.snap
index 49b58ee7bb..8f252ac7a4 100644
--- a/src/domains/dashboard/pages/Dashboard/__snapshots__/Dashboard.test.tsx.snap
+++ b/src/domains/dashboard/pages/Dashboard/__snapshots__/Dashboard.test.tsx.snap
@@ -2095,7 +2095,7 @@ exports[`Dashboard should fetch more transactions 1`] = `
                 </div>
               </div>
               <button
-                class="sc-AxhCb hPLjLy w-full mt-10 mb-5"
+                class="sc-AxhCb hvkszb w-full mt-10 mb-5"
                 color="primary"
                 data-testid="transactions__fetch-more-button"
                 type="button"
@@ -3675,7 +3675,7 @@ exports[`Dashboard should hide portfolio view 1`] = `
                 </div>
               </div>
               <button
-                class="sc-AxhCb hPLjLy w-full mt-10 mb-5"
+                class="sc-AxhCb hvkszb w-full mt-10 mb-5"
                 color="primary"
                 data-testid="transactions__fetch-more-button"
                 type="button"
@@ -6211,7 +6211,7 @@ exports[`Dashboard should open detail modal on transaction row click 1`] = `
                 </div>
               </div>
               <button
-                class="sc-AxhCb hPLjLy w-full mt-10 mb-5"
+                class="sc-AxhCb hvkszb w-full mt-10 mb-5"
                 color="primary"
                 data-testid="transactions__fetch-more-button"
                 type="button"
@@ -7758,7 +7758,7 @@ exports[`Dashboard should render 1`] = `
                 </div>
               </div>
               <button
-                class="sc-AxhCb hPLjLy w-full mt-10 mb-5"
+                class="sc-AxhCb hvkszb w-full mt-10 mb-5"
                 color="primary"
                 data-testid="transactions__fetch-more-button"
                 type="button"
@@ -9305,7 +9305,7 @@ exports[`Dashboard should render portfolio chart 1`] = `
                 </div>
               </div>
               <button
-                class="sc-AxhCb hPLjLy w-full mt-10 mb-5"
+                class="sc-AxhCb hvkszb w-full mt-10 mb-5"
                 color="primary"
                 data-testid="transactions__fetch-more-button"
                 type="button"
@@ -10852,7 +10852,7 @@ exports[`Dashboard should render portfolio percentage bar 1`] = `
                 </div>
               </div>
               <button
-                class="sc-AxhCb hPLjLy w-full mt-10 mb-5"
+                class="sc-AxhCb hvkszb w-full mt-10 mb-5"
                 color="primary"
                 data-testid="transactions__fetch-more-button"
                 type="button"
@@ -12399,7 +12399,7 @@ exports[`Dashboard should render wallets 1`] = `
                 </div>
               </div>
               <button
-                class="sc-AxhCb hPLjLy w-full mt-10 mb-5"
+                class="sc-AxhCb hvkszb w-full mt-10 mb-5"
                 color="primary"
                 data-testid="transactions__fetch-more-button"
                 type="button"
diff --git a/src/domains/help/components/ContactUs/__snapshots__/ContactUs.test.tsx.snap b/src/domains/help/components/ContactUs/__snapshots__/ContactUs.test.tsx.snap
index 729dc272ba..75874b3d29 100644
--- a/src/domains/help/components/ContactUs/__snapshots__/ContactUs.test.tsx.snap
+++ b/src/domains/help/components/ContactUs/__snapshots__/ContactUs.test.tsx.snap
@@ -204,24 +204,38 @@ exports[`ContactUs should render a modal 1`] = `
                 <div
                   class="relative w-full cursor-pointer"
                 >
-                  <div>
-                    <button
-                      aria-expanded="false"
-                      aria-haspopup="listbox"
-                      aria-labelledby="downshift-0-label downshift-0-toggle-button"
-                      class="sc-fznyAO clcORT   "
-                      data-testid="select-list__toggle-button"
-                      id="downshift-0-toggle-button"
-                      type="button"
+                  <div
+                    aria-expanded="false"
+                    aria-haspopup="listbox"
+                    aria-owns="downshift-1-menu"
+                    role="combobox"
+                  >
+                    <label
+                      for="downshift-0-input"
+                      id="downshift-1-label"
+                    />
+                    <div
+                      class="sc-AxmLO kuiknc"
+                      data-testid="SelectDropdownInput"
                     >
-                      Select
-                    </button>
+                      <input
+                        aria-autocomplete="list"
+                        aria-controls="downshift-1-menu"
+                        aria-labelledby="downshift-1-label"
+                        autocomplete="off"
+                        class="sc-AxhUy jqmzti overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                        data-testid="SelectDropdownInput__input"
+                        id="downshift-0-input"
+                        name="subject"
+                        placeholder="Select"
+                        value=""
+                      />
+                    </div>
                     <ul
-                      aria-labelledby="downshift-0-label"
-                      class="sc-fznKkj iVkfZr"
-                      id="downshift-0-menu"
+                      aria-labelledby="downshift-1-label"
+                      class="sc-fznyAO iPPKQM"
+                      id="downshift-1-menu"
                       role="listbox"
-                      tabindex="-1"
                     />
                   </div>
                   <div
diff --git a/src/domains/profile/pages/CreateProfile/__snapshots__/CreateProfile.test.tsx.snap b/src/domains/profile/pages/CreateProfile/__snapshots__/CreateProfile.test.tsx.snap
index 93b46b0f3f..3f18e5f2d9 100644
--- a/src/domains/profile/pages/CreateProfile/__snapshots__/CreateProfile.test.tsx.snap
+++ b/src/domains/profile/pages/CreateProfile/__snapshots__/CreateProfile.test.tsx.snap
@@ -971,24 +971,38 @@ exports[`CreateProfile should render 1`] = `
                       <div
                         class="relative w-full cursor-pointer"
                       >
-                        <div>
-                          <button
-                            aria-expanded="false"
-                            aria-haspopup="listbox"
-                            aria-labelledby="downshift-0-label downshift-0-toggle-button"
-                            class="sc-fzoyTs buZKoP   "
-                            data-testid="select-list__toggle-button"
-                            id="downshift-0-toggle-button"
-                            type="button"
+                        <div
+                          aria-expanded="false"
+                          aria-haspopup="listbox"
+                          aria-owns="downshift-1-menu"
+                          role="combobox"
+                        >
+                          <label
+                            for="downshift-0-input"
+                            id="downshift-1-label"
+                          />
+                          <div
+                            class="sc-AxmLO kuiknc"
+                            data-testid="SelectDropdownInput"
                           >
-                            Select Currency
-                          </button>
+                            <input
+                              aria-autocomplete="list"
+                              aria-controls="downshift-1-menu"
+                              aria-labelledby="downshift-1-label"
+                              autocomplete="off"
+                              class="sc-AxhUy jqmzti overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                              data-testid="SelectDropdownInput__input"
+                              id="downshift-0-input"
+                              name="currency"
+                              placeholder="Select Currency"
+                              value=""
+                            />
+                          </div>
                           <ul
-                            aria-labelledby="downshift-0-label"
-                            class="sc-fzoNJl gPmoPk"
-                            id="downshift-0-menu"
+                            aria-labelledby="downshift-1-label"
+                            class="sc-fzoyTs bGjmHs"
+                            id="downshift-1-menu"
                             role="listbox"
-                            tabindex="-1"
                           />
                         </div>
                         <div
diff --git a/src/domains/setting/pages/Settings/__snapshots__/Settings.test.tsx.snap b/src/domains/setting/pages/Settings/__snapshots__/Settings.test.tsx.snap
index 93580cc330..52cabec37e 100644
--- a/src/domains/setting/pages/Settings/__snapshots__/Settings.test.tsx.snap
+++ b/src/domains/setting/pages/Settings/__snapshots__/Settings.test.tsx.snap
@@ -211,12 +211,12 @@ exports[`Settings should change a password 1`] = `
                   >
                     <img
                       alt="Profile Avatar"
-                      src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(139, 195, 74)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"45\\" cx=\\"100\\" cy=\\"50\\" fill=\\"rgb(33, 150, 243)\\"/><circle r=\\"40\\" cx=\\"10\\" cy=\\"70\\" fill=\\"rgb(3, 169, 244)\\"/><circle r=\\"60\\" cx=\\"50\\" cy=\\"60\\" fill=\\"rgb(0, 150, 136)\\"/></svg>"
+                      src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(103, 58, 183)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"45\\" cx=\\"80\\" cy=\\"70\\" fill=\\"rgb(255, 152, 0)\\"/><circle r=\\"35\\" cx=\\"30\\" cy=\\"50\\" fill=\\"rgb(63, 81, 181)\\"/><circle r=\\"55\\" cx=\\"90\\" cy=\\"60\\" fill=\\"rgb(139, 195, 74)\\"/></svg>"
                     />
                     <span
                       class="absolute text-sm font-semibold text-theme-background"
                     >
-                      TE
+                      J
                     </span>
                   </div>
                   <span
@@ -2088,12 +2088,12 @@ exports[`Settings should open & close modals in the plugin settings 1`] = `
                   >
                     <img
                       alt="Profile Avatar"
-                      src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(139, 195, 74)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"45\\" cx=\\"100\\" cy=\\"50\\" fill=\\"rgb(33, 150, 243)\\"/><circle r=\\"40\\" cx=\\"10\\" cy=\\"70\\" fill=\\"rgb(3, 169, 244)\\"/><circle r=\\"60\\" cx=\\"50\\" cy=\\"60\\" fill=\\"rgb(0, 150, 136)\\"/></svg>"
+                      src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(103, 58, 183)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"45\\" cx=\\"80\\" cy=\\"70\\" fill=\\"rgb(255, 152, 0)\\"/><circle r=\\"35\\" cx=\\"30\\" cy=\\"50\\" fill=\\"rgb(63, 81, 181)\\"/><circle r=\\"55\\" cx=\\"90\\" cy=\\"60\\" fill=\\"rgb(139, 195, 74)\\"/></svg>"
                     />
                     <span
                       class="absolute text-sm font-semibold text-theme-background"
                     >
-                      TE
+                      J
                     </span>
                   </div>
                   <span
@@ -2462,24 +2462,38 @@ exports[`Settings should open & close modals in the plugin settings 1`] = `
                               <div
                                 class="relative w-full cursor-pointer"
                               >
-                                <div>
-                                  <button
-                                    aria-expanded="false"
-                                    aria-haspopup="listbox"
-                                    aria-labelledby="downshift-454-label downshift-454-toggle-button"
-                                    class="sc-fzoXWK dAGxql   "
-                                    data-testid="select-list__toggle-button"
-                                    id="downshift-454-toggle-button"
-                                    type="button"
+                                <div
+                                  aria-expanded="false"
+                                  aria-haspopup="listbox"
+                                  aria-owns="downshift-751-menu"
+                                  role="combobox"
+                                >
+                                  <label
+                                    for="downshift-750-input"
+                                    id="downshift-751-label"
+                                  />
+                                  <div
+                                    class="sc-fzpjYC dHxzen"
+                                    data-testid="SelectDropdownInput"
                                   >
-                                    Select Plugin Source
-                                  </button>
+                                    <input
+                                      aria-autocomplete="list"
+                                      aria-controls="downshift-751-menu"
+                                      aria-labelledby="downshift-751-label"
+                                      autocomplete="off"
+                                      class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                                      data-testid="SelectDropdownInput__input"
+                                      id="downshift-750-input"
+                                      name="load-plugins"
+                                      placeholder="Select Plugin Source"
+                                      value=""
+                                    />
+                                  </div>
                                   <ul
-                                    aria-labelledby="downshift-454-label"
-                                    class="sc-fzpmMD dhwOMv"
-                                    id="downshift-454-menu"
+                                    aria-labelledby="downshift-751-label"
+                                    class="sc-fzoXWK edrIhW"
+                                    id="downshift-751-menu"
                                     role="listbox"
-                                    tabindex="-1"
                                   />
                                 </div>
                                 <div
@@ -2984,7 +2998,7 @@ exports[`Settings should render 1`] = `
                           class="relative w-24 h-24 rounded bg-theme-neutral-contrast"
                         >
                           <div
-                            class="sc-fznxKY clIQbl"
+                            class="sc-fzpmMD dqyPMh"
                           >
                             <img
                               alt="Profile avatar"
@@ -3074,24 +3088,44 @@ exports[`Settings should render 1`] = `
                             <div
                               class="relative w-full cursor-pointer"
                             >
-                              <div>
-                                <button
-                                  aria-expanded="false"
-                                  aria-haspopup="listbox"
-                                  aria-labelledby="downshift-0-label downshift-0-toggle-button"
-                                  class="sc-fzoXWK dAGxql  is-selected "
-                                  data-testid="select-list__toggle-button"
-                                  id="downshift-0-toggle-button"
-                                  type="button"
+                              <div
+                                aria-expanded="false"
+                                aria-haspopup="listbox"
+                                aria-owns="downshift-1-menu"
+                                role="combobox"
+                              >
+                                <label
+                                  for="downshift-0-input"
+                                  id="downshift-1-label"
+                                />
+                                <div
+                                  class="sc-fzpjYC dHxzen"
+                                  data-testid="SelectDropdownInput"
                                 >
-                                  English
-                                </button>
+                                  <span
+                                    class="sc-fzoyAV gCfUUB py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+                                    data-testid="SelectDropdownInput__typeahead"
+                                  >
+                                    English
+                                  </span>
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-controls="downshift-1-menu"
+                                    aria-labelledby="downshift-1-label"
+                                    autocomplete="off"
+                                    class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                                    data-testid="SelectDropdownInput__input"
+                                    id="downshift-0-input"
+                                    name="passphraseLanguage"
+                                    placeholder="Select Passphrase Language"
+                                    value="English"
+                                  />
+                                </div>
                                 <ul
-                                  aria-labelledby="downshift-0-label"
-                                  class="sc-fzpmMD dhwOMv"
-                                  id="downshift-0-menu"
+                                  aria-labelledby="downshift-1-label"
+                                  class="sc-fzoXWK edrIhW"
+                                  id="downshift-1-menu"
                                   role="listbox"
-                                  tabindex="-1"
                                 />
                               </div>
                               <div
@@ -3138,24 +3172,44 @@ exports[`Settings should render 1`] = `
                             <div
                               class="relative w-full cursor-pointer"
                             >
-                              <div>
-                                <button
-                                  aria-expanded="false"
-                                  aria-haspopup="listbox"
-                                  aria-labelledby="downshift-1-label downshift-1-toggle-button"
-                                  class="sc-fzoXWK dAGxql  is-selected "
-                                  data-testid="select-list__toggle-button"
-                                  id="downshift-1-toggle-button"
-                                  type="button"
+                              <div
+                                aria-expanded="false"
+                                aria-haspopup="listbox"
+                                aria-owns="downshift-3-menu"
+                                role="combobox"
+                              >
+                                <label
+                                  for="downshift-2-input"
+                                  id="downshift-3-label"
+                                />
+                                <div
+                                  class="sc-fzpjYC dHxzen"
+                                  data-testid="SelectDropdownInput"
                                 >
-                                  BTC (Ƀ)
-                                </button>
+                                  <span
+                                    class="sc-fzoyAV gCfUUB py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+                                    data-testid="SelectDropdownInput__typeahead"
+                                  >
+                                    BTC (Ƀ)
+                                  </span>
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-controls="downshift-3-menu"
+                                    aria-labelledby="downshift-3-label"
+                                    autocomplete="off"
+                                    class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                                    data-testid="SelectDropdownInput__input"
+                                    id="downshift-2-input"
+                                    name="currency"
+                                    placeholder="Select Currency"
+                                    value="BTC (Ƀ)"
+                                  />
+                                </div>
                                 <ul
-                                  aria-labelledby="downshift-1-label"
-                                  class="sc-fzpmMD dhwOMv"
-                                  id="downshift-1-menu"
+                                  aria-labelledby="downshift-3-label"
+                                  class="sc-fzoXWK edrIhW"
+                                  id="downshift-3-menu"
                                   role="listbox"
-                                  tabindex="-1"
                                 />
                               </div>
                               <div
@@ -3206,24 +3260,44 @@ exports[`Settings should render 1`] = `
                             <div
                               class="relative w-full cursor-pointer"
                             >
-                              <div>
-                                <button
-                                  aria-expanded="false"
-                                  aria-haspopup="listbox"
-                                  aria-labelledby="downshift-2-label downshift-2-toggle-button"
-                                  class="sc-fzoXWK dAGxql  is-selected "
-                                  data-testid="select-list__toggle-button"
-                                  id="downshift-2-toggle-button"
-                                  type="button"
+                              <div
+                                aria-expanded="false"
+                                aria-haspopup="listbox"
+                                aria-owns="downshift-5-menu"
+                                role="combobox"
+                              >
+                                <label
+                                  for="downshift-4-input"
+                                  id="downshift-5-label"
+                                />
+                                <div
+                                  class="sc-fzpjYC dHxzen"
+                                  data-testid="SelectDropdownInput"
                                 >
-                                  English
-                                </button>
+                                  <span
+                                    class="sc-fzoyAV gCfUUB py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+                                    data-testid="SelectDropdownInput__typeahead"
+                                  >
+                                    English
+                                  </span>
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-controls="downshift-5-menu"
+                                    aria-labelledby="downshift-5-label"
+                                    autocomplete="off"
+                                    class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                                    data-testid="SelectDropdownInput__input"
+                                    id="downshift-4-input"
+                                    name="language"
+                                    placeholder="Select Language"
+                                    value="English"
+                                  />
+                                </div>
                                 <ul
-                                  aria-labelledby="downshift-2-label"
-                                  class="sc-fzpmMD dhwOMv"
-                                  id="downshift-2-menu"
+                                  aria-labelledby="downshift-5-label"
+                                  class="sc-fzoXWK edrIhW"
+                                  id="downshift-5-menu"
                                   role="listbox"
-                                  tabindex="-1"
                                 />
                               </div>
                               <div
@@ -3270,24 +3344,44 @@ exports[`Settings should render 1`] = `
                             <div
                               class="relative w-full cursor-pointer"
                             >
-                              <div>
-                                <button
-                                  aria-expanded="false"
-                                  aria-haspopup="listbox"
-                                  aria-labelledby="downshift-3-label downshift-3-toggle-button"
-                                  class="sc-fzoXWK dAGxql  is-selected "
-                                  data-testid="select-list__toggle-button"
-                                  id="downshift-3-toggle-button"
-                                  type="button"
+                              <div
+                                aria-expanded="false"
+                                aria-haspopup="listbox"
+                                aria-owns="downshift-7-menu"
+                                role="combobox"
+                              >
+                                <label
+                                  for="downshift-6-input"
+                                  id="downshift-7-label"
+                                />
+                                <div
+                                  class="sc-fzpjYC dHxzen"
+                                  data-testid="SelectDropdownInput"
                                 >
-                                  CryptoCompare
-                                </button>
+                                  <span
+                                    class="sc-fzoyAV gCfUUB py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+                                    data-testid="SelectDropdownInput__typeahead"
+                                  >
+                                    CryptoCompare
+                                  </span>
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-controls="downshift-7-menu"
+                                    aria-labelledby="downshift-7-label"
+                                    autocomplete="off"
+                                    class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                                    data-testid="SelectDropdownInput__input"
+                                    id="downshift-6-input"
+                                    name="marketProvider"
+                                    placeholder="Select Market Provider"
+                                    value="CryptoCompare"
+                                  />
+                                </div>
                                 <ul
-                                  aria-labelledby="downshift-3-label"
-                                  class="sc-fzpmMD dhwOMv"
-                                  id="downshift-3-menu"
+                                  aria-labelledby="downshift-7-label"
+                                  class="sc-fzoXWK edrIhW"
+                                  id="downshift-7-menu"
                                   role="listbox"
-                                  tabindex="-1"
                                 />
                               </div>
                               <div
@@ -3334,24 +3428,44 @@ exports[`Settings should render 1`] = `
                             <div
                               class="relative w-full cursor-pointer"
                             >
-                              <div>
-                                <button
-                                  aria-expanded="false"
-                                  aria-haspopup="listbox"
-                                  aria-labelledby="downshift-4-label downshift-4-toggle-button"
-                                  class="sc-fzoXWK dAGxql  is-selected "
-                                  data-testid="select-list__toggle-button"
-                                  id="downshift-4-toggle-button"
-                                  type="button"
+                              <div
+                                aria-expanded="false"
+                                aria-haspopup="listbox"
+                                aria-owns="downshift-9-menu"
+                                role="combobox"
+                              >
+                                <label
+                                  for="downshift-8-input"
+                                  id="downshift-9-label"
+                                />
+                                <div
+                                  class="sc-fzpjYC dHxzen"
+                                  data-testid="SelectDropdownInput"
                                 >
-                                  12h
-                                </button>
+                                  <span
+                                    class="sc-fzoyAV gCfUUB py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+                                    data-testid="SelectDropdownInput__typeahead"
+                                  >
+                                    12h
+                                  </span>
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-controls="downshift-9-menu"
+                                    aria-labelledby="downshift-9-label"
+                                    autocomplete="off"
+                                    class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                                    data-testid="SelectDropdownInput__input"
+                                    id="downshift-8-input"
+                                    name="timeFormat"
+                                    placeholder="Select Time Format"
+                                    value="12h"
+                                  />
+                                </div>
                                 <ul
-                                  aria-labelledby="downshift-4-label"
-                                  class="sc-fzpmMD dhwOMv"
-                                  id="downshift-4-menu"
+                                  aria-labelledby="downshift-9-label"
+                                  class="sc-fzoXWK edrIhW"
+                                  id="downshift-9-menu"
                                   role="listbox"
-                                  tabindex="-1"
                                 />
                               </div>
                               <div
@@ -3533,24 +3647,44 @@ exports[`Settings should render 1`] = `
                               <div
                                 class="relative w-full cursor-pointer"
                               >
-                                <div>
-                                  <button
-                                    aria-expanded="false"
-                                    aria-haspopup="listbox"
-                                    aria-labelledby="downshift-5-label downshift-5-toggle-button"
-                                    class="sc-fzoXWK dAGxql  is-selected "
-                                    data-testid="select-list__toggle-button"
-                                    id="downshift-5-toggle-button"
-                                    type="button"
+                                <div
+                                  aria-expanded="false"
+                                  aria-haspopup="listbox"
+                                  aria-owns="downshift-11-menu"
+                                  role="combobox"
+                                >
+                                  <label
+                                    for="downshift-10-input"
+                                    id="downshift-11-label"
+                                  />
+                                  <div
+                                    class="sc-fzpjYC dHxzen"
+                                    data-testid="SelectDropdownInput"
                                   >
-                                    1 minute
-                                  </button>
+                                    <span
+                                      class="sc-fzoyAV gCfUUB py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+                                      data-testid="SelectDropdownInput__typeahead"
+                                    >
+                                      1 minute
+                                    </span>
+                                    <input
+                                      aria-autocomplete="list"
+                                      aria-controls="downshift-11-menu"
+                                      aria-labelledby="downshift-11-label"
+                                      autocomplete="off"
+                                      class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                                      data-testid="SelectDropdownInput__input"
+                                      id="downshift-10-input"
+                                      name="automaticSignOutPeriod"
+                                      placeholder="Select Automatic Sign Out Period"
+                                      value="1 minute"
+                                    />
+                                  </div>
                                   <ul
-                                    aria-labelledby="downshift-5-label"
-                                    class="sc-fzpmMD dhwOMv"
-                                    id="downshift-5-menu"
+                                    aria-labelledby="downshift-11-label"
+                                    class="sc-fzoXWK edrIhW"
+                                    id="downshift-11-menu"
                                     role="listbox"
-                                    tabindex="-1"
                                   />
                                 </div>
                                 <div
@@ -3946,12 +4080,12 @@ exports[`Settings should render password settings 1`] = `
                   >
                     <img
                       alt="Profile Avatar"
-                      src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(139, 195, 74)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"45\\" cx=\\"100\\" cy=\\"50\\" fill=\\"rgb(33, 150, 243)\\"/><circle r=\\"40\\" cx=\\"10\\" cy=\\"70\\" fill=\\"rgb(3, 169, 244)\\"/><circle r=\\"60\\" cx=\\"50\\" cy=\\"60\\" fill=\\"rgb(0, 150, 136)\\"/></svg>"
+                      src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(103, 58, 183)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"45\\" cx=\\"80\\" cy=\\"70\\" fill=\\"rgb(255, 152, 0)\\"/><circle r=\\"35\\" cx=\\"30\\" cy=\\"50\\" fill=\\"rgb(63, 81, 181)\\"/><circle r=\\"55\\" cx=\\"90\\" cy=\\"60\\" fill=\\"rgb(139, 195, 74)\\"/></svg>"
                     />
                     <span
                       class="absolute text-sm font-semibold text-theme-background"
                     >
-                      TE
+                      J
                     </span>
                   </div>
                   <span
@@ -4492,12 +4626,12 @@ exports[`Settings should render peer settings 1`] = `
                   >
                     <img
                       alt="Profile Avatar"
-                      src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(139, 195, 74)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"45\\" cx=\\"100\\" cy=\\"50\\" fill=\\"rgb(33, 150, 243)\\"/><circle r=\\"40\\" cx=\\"10\\" cy=\\"70\\" fill=\\"rgb(3, 169, 244)\\"/><circle r=\\"60\\" cx=\\"50\\" cy=\\"60\\" fill=\\"rgb(0, 150, 136)\\"/></svg>"
+                      src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(103, 58, 183)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"45\\" cx=\\"80\\" cy=\\"70\\" fill=\\"rgb(255, 152, 0)\\"/><circle r=\\"35\\" cx=\\"30\\" cy=\\"50\\" fill=\\"rgb(63, 81, 181)\\"/><circle r=\\"55\\" cx=\\"90\\" cy=\\"60\\" fill=\\"rgb(139, 195, 74)\\"/></svg>"
                     />
                     <span
                       class="absolute text-sm font-semibold text-theme-background"
                     >
-                      TE
+                      J
                     </span>
                   </div>
                   <span
@@ -5384,12 +5518,12 @@ exports[`Settings should render plugin settings 1`] = `
                   >
                     <img
                       alt="Profile Avatar"
-                      src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(139, 195, 74)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"45\\" cx=\\"100\\" cy=\\"50\\" fill=\\"rgb(33, 150, 243)\\"/><circle r=\\"40\\" cx=\\"10\\" cy=\\"70\\" fill=\\"rgb(3, 169, 244)\\"/><circle r=\\"60\\" cx=\\"50\\" cy=\\"60\\" fill=\\"rgb(0, 150, 136)\\"/></svg>"
+                      src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(103, 58, 183)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"45\\" cx=\\"80\\" cy=\\"70\\" fill=\\"rgb(255, 152, 0)\\"/><circle r=\\"35\\" cx=\\"30\\" cy=\\"50\\" fill=\\"rgb(63, 81, 181)\\"/><circle r=\\"55\\" cx=\\"90\\" cy=\\"60\\" fill=\\"rgb(139, 195, 74)\\"/></svg>"
                     />
                     <span
                       class="absolute text-sm font-semibold text-theme-background"
                     >
-                      TE
+                      J
                     </span>
                   </div>
                   <span
@@ -5758,24 +5892,38 @@ exports[`Settings should render plugin settings 1`] = `
                               <div
                                 class="relative w-full cursor-pointer"
                               >
-                                <div>
-                                  <button
-                                    aria-expanded="false"
-                                    aria-haspopup="listbox"
-                                    aria-labelledby="downshift-413-label downshift-413-toggle-button"
-                                    class="sc-fzoXWK dAGxql   "
-                                    data-testid="select-list__toggle-button"
-                                    id="downshift-413-toggle-button"
-                                    type="button"
+                                <div
+                                  aria-expanded="false"
+                                  aria-haspopup="listbox"
+                                  aria-owns="downshift-641-menu"
+                                  role="combobox"
+                                >
+                                  <label
+                                    for="downshift-640-input"
+                                    id="downshift-641-label"
+                                  />
+                                  <div
+                                    class="sc-fzpjYC dHxzen"
+                                    data-testid="SelectDropdownInput"
                                   >
-                                    Select Plugin Source
-                                  </button>
+                                    <input
+                                      aria-autocomplete="list"
+                                      aria-controls="downshift-641-menu"
+                                      aria-labelledby="downshift-641-label"
+                                      autocomplete="off"
+                                      class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                                      data-testid="SelectDropdownInput__input"
+                                      id="downshift-640-input"
+                                      name="load-plugins"
+                                      placeholder="Select Plugin Source"
+                                      value=""
+                                    />
+                                  </div>
                                   <ul
-                                    aria-labelledby="downshift-413-label"
-                                    class="sc-fzpmMD dhwOMv"
-                                    id="downshift-413-menu"
+                                    aria-labelledby="downshift-641-label"
+                                    class="sc-fzoXWK edrIhW"
+                                    id="downshift-641-menu"
                                     role="listbox"
-                                    tabindex="-1"
                                   />
                                 </div>
                                 <div
@@ -6036,12 +6184,12 @@ exports[`Settings should set a password 1`] = `
                   >
                     <img
                       alt="Profile Avatar"
-                      src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(139, 195, 74)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"45\\" cx=\\"100\\" cy=\\"50\\" fill=\\"rgb(33, 150, 243)\\"/><circle r=\\"40\\" cx=\\"10\\" cy=\\"70\\" fill=\\"rgb(3, 169, 244)\\"/><circle r=\\"60\\" cx=\\"50\\" cy=\\"60\\" fill=\\"rgb(0, 150, 136)\\"/></svg>"
+                      src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(103, 58, 183)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"45\\" cx=\\"80\\" cy=\\"70\\" fill=\\"rgb(255, 152, 0)\\"/><circle r=\\"35\\" cx=\\"30\\" cy=\\"50\\" fill=\\"rgb(63, 81, 181)\\"/><circle r=\\"55\\" cx=\\"90\\" cy=\\"60\\" fill=\\"rgb(139, 195, 74)\\"/></svg>"
                     />
                     <span
                       class="absolute text-sm font-semibold text-theme-background"
                     >
-                      TE
+                      J
                     </span>
                   </div>
                   <span
@@ -6627,12 +6775,12 @@ exports[`Settings should show an error toast if the current password does not ma
                   >
                     <img
                       alt="Profile Avatar"
-                      src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(139, 195, 74)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"45\\" cx=\\"100\\" cy=\\"50\\" fill=\\"rgb(33, 150, 243)\\"/><circle r=\\"40\\" cx=\\"10\\" cy=\\"70\\" fill=\\"rgb(3, 169, 244)\\"/><circle r=\\"60\\" cx=\\"50\\" cy=\\"60\\" fill=\\"rgb(0, 150, 136)\\"/></svg>"
+                      src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(103, 58, 183)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"45\\" cx=\\"80\\" cy=\\"70\\" fill=\\"rgb(255, 152, 0)\\"/><circle r=\\"35\\" cx=\\"30\\" cy=\\"50\\" fill=\\"rgb(63, 81, 181)\\"/><circle r=\\"55\\" cx=\\"90\\" cy=\\"60\\" fill=\\"rgb(139, 195, 74)\\"/></svg>"
                     />
                     <span
                       class="absolute text-sm font-semibold text-theme-background"
                     >
-                      TE
+                      J
                     </span>
                   </div>
                   <span
diff --git a/src/domains/transaction/components/EntityRegistrationForm/__snapshots__/EntityRegistrationForm.test.tsx.snap b/src/domains/transaction/components/EntityRegistrationForm/__snapshots__/EntityRegistrationForm.test.tsx.snap
index 6afc344175..b557ce4687 100644
--- a/src/domains/transaction/components/EntityRegistrationForm/__snapshots__/EntityRegistrationForm.test.tsx.snap
+++ b/src/domains/transaction/components/EntityRegistrationForm/__snapshots__/EntityRegistrationForm.test.tsx.snap
@@ -34,7 +34,7 @@ exports[`EntityRegistrationForm should render 3rd step 1`] = `
           </div>
           <div>
             <div
-              class="sc-fznxsB koiMhf"
+              class="sc-fzpjYC eWrHrY"
               data-testid="TransactionDetail"
             >
               <div
@@ -53,7 +53,7 @@ exports[`EntityRegistrationForm should render 3rd step 1`] = `
               </div>
               <div
                 aria-label="ARK Devnet"
-                class="sc-fzoXzr cICWRQ border-theme-primary-100 text-theme-primary-400"
+                class="sc-fzoLag fcFiBG border-theme-primary-100 text-theme-primary-400"
                 data-testid="NetworkIcon-ARK-ark.devnet"
               >
                 <div
@@ -69,7 +69,7 @@ exports[`EntityRegistrationForm should render 3rd step 1`] = `
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -84,7 +84,7 @@ exports[`EntityRegistrationForm should render 3rd step 1`] = `
                     Sender
                   </span>
                   <div
-                    class="sc-fzpjYC iaNNZb"
+                    class="sc-fzoXzr bCAwec"
                     color="warning"
                   >
                     <span
@@ -107,7 +107,7 @@ exports[`EntityRegistrationForm should render 3rd step 1`] = `
                       ARK Wallet 1
                     </span>
                     <span
-                      class="sc-fznWqX clGFVO text-theme-neutral-light font-semibold text-base"
+                      class="sc-fznJRM fzFSIN text-theme-neutral-light font-semibold text-base"
                       data-testid="address__wallet-address"
                     >
                       D8rr7B…s6YUYD
@@ -135,7 +135,7 @@ exports[`EntityRegistrationForm should render 3rd step 1`] = `
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -153,7 +153,7 @@ exports[`EntityRegistrationForm should render 3rd step 1`] = `
                 </div>
               </div>
               <div
-                class="sc-fzoXzr cICWRQ border-theme-text"
+                class="sc-fzoLag fcFiBG border-theme-text"
               >
                 <div
                   class="sc-AxhUy hSYVGy"
@@ -167,7 +167,7 @@ exports[`EntityRegistrationForm should render 3rd step 1`] = `
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -186,7 +186,7 @@ exports[`EntityRegistrationForm should render 3rd step 1`] = `
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -205,7 +205,7 @@ exports[`EntityRegistrationForm should render 3rd step 1`] = `
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -220,7 +220,7 @@ exports[`EntityRegistrationForm should render 3rd step 1`] = `
                   class="font-semibold"
                 >
                   <a
-                    class="sc-fznJRM gnSyAW inline-flex items-center font-semibold transition-colors duration-200 cursor-pointer text-theme-primary hover:text-theme-primary-dark hover:underline active:text-theme-primary-500"
+                    class="sc-fznxsB kiyLQS inline-flex items-center font-semibold transition-colors duration-200 cursor-pointer text-theme-primary hover:text-theme-primary-dark hover:underline active:text-theme-primary-500"
                     data-testid="Link"
                     rel="noopener noreferrer"
                     to="https://test.entity.com"
@@ -241,7 +241,7 @@ exports[`EntityRegistrationForm should render 3rd step 1`] = `
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -285,7 +285,7 @@ exports[`EntityRegistrationForm should render 3rd step 1`] = `
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -329,7 +329,7 @@ exports[`EntityRegistrationForm should render 3rd step 1`] = `
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG mb-2"
+              class="sc-fzpjYC bwSvOp mb-2"
               data-testid="TransactionDetail"
             >
               <div
@@ -388,7 +388,7 @@ exports[`EntityRegistrationForm should render 3rd step 1`] = `
                       class="flex flex-col w-1/2 justify-center px-4 py-2"
                     >
                       <span
-                        class="sc-fzqARJ dcHXa-d"
+                        class="sc-fzoiQi klRelP"
                       >
                         Transaction Amount
                       </span>
@@ -403,7 +403,7 @@ exports[`EntityRegistrationForm should render 3rd step 1`] = `
                       class="flex flex-col w-1/2 justify-center px-4 py-2 text-right"
                     >
                       <span
-                        class="sc-fzqARJ dcHXa-d"
+                        class="sc-fzoiQi klRelP"
                       >
                         Transaction Fee
                       </span>
@@ -437,7 +437,7 @@ exports[`EntityRegistrationForm should render 3rd step 1`] = `
                   class="flex flex-col items-center py-6 border-t rounded-b-lg border-theme-neutral-300 justfiy-center bg-theme-neutral-contrast"
                 >
                   <span
-                    class="sc-fzqARJ dcHXa-d"
+                    class="sc-fzoiQi klRelP"
                   >
                     Total Amount
                   </span>
@@ -492,7 +492,7 @@ exports[`EntityRegistrationForm should render 3rd step without images 1`] = `
           </div>
           <div>
             <div
-              class="sc-fznxsB koiMhf"
+              class="sc-fzpjYC eWrHrY"
               data-testid="TransactionDetail"
             >
               <div
@@ -511,7 +511,7 @@ exports[`EntityRegistrationForm should render 3rd step without images 1`] = `
               </div>
               <div
                 aria-label="ARK Devnet"
-                class="sc-fzoXzr cICWRQ border-theme-primary-100 text-theme-primary-400"
+                class="sc-fzoLag fcFiBG border-theme-primary-100 text-theme-primary-400"
                 data-testid="NetworkIcon-ARK-ark.devnet"
               >
                 <div
@@ -527,7 +527,7 @@ exports[`EntityRegistrationForm should render 3rd step without images 1`] = `
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -542,7 +542,7 @@ exports[`EntityRegistrationForm should render 3rd step without images 1`] = `
                     Sender
                   </span>
                   <div
-                    class="sc-fzpjYC iaNNZb"
+                    class="sc-fzoXzr bCAwec"
                     color="warning"
                   >
                     <span
@@ -565,7 +565,7 @@ exports[`EntityRegistrationForm should render 3rd step without images 1`] = `
                       ARK Wallet 1
                     </span>
                     <span
-                      class="sc-fznWqX clGFVO text-theme-neutral-light font-semibold text-base"
+                      class="sc-fznJRM fzFSIN text-theme-neutral-light font-semibold text-base"
                       data-testid="address__wallet-address"
                     >
                       D8rr7B…s6YUYD
@@ -593,7 +593,7 @@ exports[`EntityRegistrationForm should render 3rd step without images 1`] = `
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -611,7 +611,7 @@ exports[`EntityRegistrationForm should render 3rd step without images 1`] = `
                 </div>
               </div>
               <div
-                class="sc-fzoXzr cICWRQ border-theme-text"
+                class="sc-fzoLag fcFiBG border-theme-text"
               >
                 <div
                   class="sc-AxhUy hSYVGy"
@@ -625,7 +625,7 @@ exports[`EntityRegistrationForm should render 3rd step without images 1`] = `
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -644,7 +644,7 @@ exports[`EntityRegistrationForm should render 3rd step without images 1`] = `
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -663,7 +663,7 @@ exports[`EntityRegistrationForm should render 3rd step without images 1`] = `
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -678,7 +678,7 @@ exports[`EntityRegistrationForm should render 3rd step without images 1`] = `
                   class="font-semibold"
                 >
                   <a
-                    class="sc-fznJRM gnSyAW inline-flex items-center font-semibold transition-colors duration-200 cursor-pointer text-theme-primary hover:text-theme-primary-dark hover:underline active:text-theme-primary-500"
+                    class="sc-fznxsB kiyLQS inline-flex items-center font-semibold transition-colors duration-200 cursor-pointer text-theme-primary hover:text-theme-primary-dark hover:underline active:text-theme-primary-500"
                     data-testid="Link"
                     rel="noopener noreferrer"
                     to="https://test.entity.com"
@@ -699,7 +699,7 @@ exports[`EntityRegistrationForm should render 3rd step without images 1`] = `
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -743,7 +743,7 @@ exports[`EntityRegistrationForm should render 3rd step without images 1`] = `
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -787,7 +787,7 @@ exports[`EntityRegistrationForm should render 3rd step without images 1`] = `
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG mb-2"
+              class="sc-fzpjYC bwSvOp mb-2"
               data-testid="TransactionDetail"
             >
               <div
@@ -846,7 +846,7 @@ exports[`EntityRegistrationForm should render 3rd step without images 1`] = `
                       class="flex flex-col w-1/2 justify-center px-4 py-2"
                     >
                       <span
-                        class="sc-fzqARJ dcHXa-d"
+                        class="sc-fzoiQi klRelP"
                       >
                         Transaction Amount
                       </span>
@@ -861,7 +861,7 @@ exports[`EntityRegistrationForm should render 3rd step without images 1`] = `
                       class="flex flex-col w-1/2 justify-center px-4 py-2 text-right"
                     >
                       <span
-                        class="sc-fzqARJ dcHXa-d"
+                        class="sc-fzoiQi klRelP"
                       >
                         Transaction Fee
                       </span>
@@ -895,7 +895,7 @@ exports[`EntityRegistrationForm should render 3rd step without images 1`] = `
                   class="flex flex-col items-center py-6 border-t rounded-b-lg border-theme-neutral-300 justfiy-center bg-theme-neutral-contrast"
                 >
                   <span
-                    class="sc-fzqARJ dcHXa-d"
+                    class="sc-fzoiQi klRelP"
                   >
                     Total Amount
                   </span>
@@ -950,7 +950,7 @@ exports[`EntityRegistrationForm should render 3rd step without unknown providers
           </div>
           <div>
             <div
-              class="sc-fznxsB koiMhf"
+              class="sc-fzpjYC eWrHrY"
               data-testid="TransactionDetail"
             >
               <div
@@ -969,7 +969,7 @@ exports[`EntityRegistrationForm should render 3rd step without unknown providers
               </div>
               <div
                 aria-label="ARK Devnet"
-                class="sc-fzoXzr cICWRQ border-theme-primary-100 text-theme-primary-400"
+                class="sc-fzoLag fcFiBG border-theme-primary-100 text-theme-primary-400"
                 data-testid="NetworkIcon-ARK-ark.devnet"
               >
                 <div
@@ -985,7 +985,7 @@ exports[`EntityRegistrationForm should render 3rd step without unknown providers
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -1000,7 +1000,7 @@ exports[`EntityRegistrationForm should render 3rd step without unknown providers
                     Sender
                   </span>
                   <div
-                    class="sc-fzpjYC iaNNZb"
+                    class="sc-fzoXzr bCAwec"
                     color="warning"
                   >
                     <span
@@ -1023,7 +1023,7 @@ exports[`EntityRegistrationForm should render 3rd step without unknown providers
                       ARK Wallet 1
                     </span>
                     <span
-                      class="sc-fznWqX clGFVO text-theme-neutral-light font-semibold text-base"
+                      class="sc-fznJRM fzFSIN text-theme-neutral-light font-semibold text-base"
                       data-testid="address__wallet-address"
                     >
                       D8rr7B…s6YUYD
@@ -1051,7 +1051,7 @@ exports[`EntityRegistrationForm should render 3rd step without unknown providers
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -1069,7 +1069,7 @@ exports[`EntityRegistrationForm should render 3rd step without unknown providers
                 </div>
               </div>
               <div
-                class="sc-fzoXzr cICWRQ border-theme-text"
+                class="sc-fzoLag fcFiBG border-theme-text"
               >
                 <div
                   class="sc-AxhUy hSYVGy"
@@ -1083,7 +1083,7 @@ exports[`EntityRegistrationForm should render 3rd step without unknown providers
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -1102,7 +1102,7 @@ exports[`EntityRegistrationForm should render 3rd step without unknown providers
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -1121,7 +1121,7 @@ exports[`EntityRegistrationForm should render 3rd step without unknown providers
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -1136,7 +1136,7 @@ exports[`EntityRegistrationForm should render 3rd step without unknown providers
                   class="font-semibold"
                 >
                   <a
-                    class="sc-fznJRM gnSyAW inline-flex items-center font-semibold transition-colors duration-200 cursor-pointer text-theme-primary hover:text-theme-primary-dark hover:underline active:text-theme-primary-500"
+                    class="sc-fznxsB kiyLQS inline-flex items-center font-semibold transition-colors duration-200 cursor-pointer text-theme-primary hover:text-theme-primary-dark hover:underline active:text-theme-primary-500"
                     data-testid="Link"
                     rel="noopener noreferrer"
                     to="https://test.entity.com"
@@ -1157,7 +1157,7 @@ exports[`EntityRegistrationForm should render 3rd step without unknown providers
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -1201,7 +1201,7 @@ exports[`EntityRegistrationForm should render 3rd step without unknown providers
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -1245,7 +1245,7 @@ exports[`EntityRegistrationForm should render 3rd step without unknown providers
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG mb-2"
+              class="sc-fzpjYC bwSvOp mb-2"
               data-testid="TransactionDetail"
             >
               <div
@@ -1304,7 +1304,7 @@ exports[`EntityRegistrationForm should render 3rd step without unknown providers
                       class="flex flex-col w-1/2 justify-center px-4 py-2"
                     >
                       <span
-                        class="sc-fzqARJ dcHXa-d"
+                        class="sc-fzoiQi klRelP"
                       >
                         Transaction Amount
                       </span>
@@ -1319,7 +1319,7 @@ exports[`EntityRegistrationForm should render 3rd step without unknown providers
                       class="flex flex-col w-1/2 justify-center px-4 py-2 text-right"
                     >
                       <span
-                        class="sc-fzqARJ dcHXa-d"
+                        class="sc-fzoiQi klRelP"
                       >
                         Transaction Fee
                       </span>
@@ -1353,7 +1353,7 @@ exports[`EntityRegistrationForm should render 3rd step without unknown providers
                   class="flex flex-col items-center py-6 border-t rounded-b-lg border-theme-neutral-300 justfiy-center bg-theme-neutral-contrast"
                 >
                   <span
-                    class="sc-fzqARJ dcHXa-d"
+                    class="sc-fzoiQi klRelP"
                   >
                     Total Amount
                   </span>
@@ -1408,7 +1408,7 @@ exports[`EntityRegistrationForm should render 3rd step without videos 1`] = `
           </div>
           <div>
             <div
-              class="sc-fznxsB koiMhf"
+              class="sc-fzpjYC eWrHrY"
               data-testid="TransactionDetail"
             >
               <div
@@ -1427,7 +1427,7 @@ exports[`EntityRegistrationForm should render 3rd step without videos 1`] = `
               </div>
               <div
                 aria-label="ARK Devnet"
-                class="sc-fzoXzr cICWRQ border-theme-primary-100 text-theme-primary-400"
+                class="sc-fzoLag fcFiBG border-theme-primary-100 text-theme-primary-400"
                 data-testid="NetworkIcon-ARK-ark.devnet"
               >
                 <div
@@ -1443,7 +1443,7 @@ exports[`EntityRegistrationForm should render 3rd step without videos 1`] = `
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -1458,7 +1458,7 @@ exports[`EntityRegistrationForm should render 3rd step without videos 1`] = `
                     Sender
                   </span>
                   <div
-                    class="sc-fzpjYC iaNNZb"
+                    class="sc-fzoXzr bCAwec"
                     color="warning"
                   >
                     <span
@@ -1481,7 +1481,7 @@ exports[`EntityRegistrationForm should render 3rd step without videos 1`] = `
                       ARK Wallet 1
                     </span>
                     <span
-                      class="sc-fznWqX clGFVO text-theme-neutral-light font-semibold text-base"
+                      class="sc-fznJRM fzFSIN text-theme-neutral-light font-semibold text-base"
                       data-testid="address__wallet-address"
                     >
                       D8rr7B…s6YUYD
@@ -1509,7 +1509,7 @@ exports[`EntityRegistrationForm should render 3rd step without videos 1`] = `
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -1527,7 +1527,7 @@ exports[`EntityRegistrationForm should render 3rd step without videos 1`] = `
                 </div>
               </div>
               <div
-                class="sc-fzoXzr cICWRQ border-theme-text"
+                class="sc-fzoLag fcFiBG border-theme-text"
               >
                 <div
                   class="sc-AxhUy hSYVGy"
@@ -1541,7 +1541,7 @@ exports[`EntityRegistrationForm should render 3rd step without videos 1`] = `
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -1560,7 +1560,7 @@ exports[`EntityRegistrationForm should render 3rd step without videos 1`] = `
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -1579,7 +1579,7 @@ exports[`EntityRegistrationForm should render 3rd step without videos 1`] = `
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -1594,7 +1594,7 @@ exports[`EntityRegistrationForm should render 3rd step without videos 1`] = `
                   class="font-semibold"
                 >
                   <a
-                    class="sc-fznJRM gnSyAW inline-flex items-center font-semibold transition-colors duration-200 cursor-pointer text-theme-primary hover:text-theme-primary-dark hover:underline active:text-theme-primary-500"
+                    class="sc-fznxsB kiyLQS inline-flex items-center font-semibold transition-colors duration-200 cursor-pointer text-theme-primary hover:text-theme-primary-dark hover:underline active:text-theme-primary-500"
                     data-testid="Link"
                     rel="noopener noreferrer"
                     to="https://test.entity.com"
@@ -1615,7 +1615,7 @@ exports[`EntityRegistrationForm should render 3rd step without videos 1`] = `
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -1659,7 +1659,7 @@ exports[`EntityRegistrationForm should render 3rd step without videos 1`] = `
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG"
+              class="sc-fzpjYC bwSvOp"
               data-testid="TransactionDetail"
             >
               <div
@@ -1703,7 +1703,7 @@ exports[`EntityRegistrationForm should render 3rd step without videos 1`] = `
               </div>
             </div>
             <div
-              class="sc-fznxsB kuSncG mb-2"
+              class="sc-fzpjYC bwSvOp mb-2"
               data-testid="TransactionDetail"
             >
               <div
@@ -1762,7 +1762,7 @@ exports[`EntityRegistrationForm should render 3rd step without videos 1`] = `
                       class="flex flex-col w-1/2 justify-center px-4 py-2"
                     >
                       <span
-                        class="sc-fzqARJ dcHXa-d"
+                        class="sc-fzoiQi klRelP"
                       >
                         Transaction Amount
                       </span>
@@ -1777,7 +1777,7 @@ exports[`EntityRegistrationForm should render 3rd step without videos 1`] = `
                       class="flex flex-col w-1/2 justify-center px-4 py-2 text-right"
                     >
                       <span
-                        class="sc-fzqARJ dcHXa-d"
+                        class="sc-fzoiQi klRelP"
                       >
                         Transaction Fee
                       </span>
@@ -1811,7 +1811,7 @@ exports[`EntityRegistrationForm should render 3rd step without videos 1`] = `
                   class="flex flex-col items-center py-6 border-t rounded-b-lg border-theme-neutral-300 justfiy-center bg-theme-neutral-contrast"
                 >
                   <span
-                    class="sc-fzqARJ dcHXa-d"
+                    class="sc-fzoiQi klRelP"
                   >
                     Total Amount
                   </span>
diff --git a/src/domains/transaction/components/LinkCollection/__snapshots__/LinkCollection.test.tsx.snap b/src/domains/transaction/components/LinkCollection/__snapshots__/LinkCollection.test.tsx.snap
index c8eace39fa..29a4d4790b 100644
--- a/src/domains/transaction/components/LinkCollection/__snapshots__/LinkCollection.test.tsx.snap
+++ b/src/domains/transaction/components/LinkCollection/__snapshots__/LinkCollection.test.tsx.snap
@@ -281,7 +281,7 @@ exports[`LinkCollection should add links 1`] = `
 exports[`LinkCollection should remove links 1`] = `
 <DocumentFragment>
   <div
-    class="sc-fzqBZW eEiUFK flex flex-col font-normal"
+    class="sc-fzokOt lkSsTn flex flex-col font-normal"
     data-testid="LinkCollection"
   >
     <div
@@ -345,22 +345,38 @@ exports[`LinkCollection should remove links 1`] = `
             <div
               class="relative w-full cursor-pointer"
             >
-              <div>
-                <button
-                  aria-expanded="false"
-                  aria-haspopup="listbox"
-                  aria-labelledby="downshift-13-label downshift-13-toggle-button"
-                  class="sc-fzplWN jAabRP   "
-                  data-testid="select-list__toggle-button"
-                  id="downshift-13-toggle-button"
-                  type="button"
+              <div
+                aria-expanded="false"
+                aria-haspopup="listbox"
+                aria-owns="downshift-9-menu"
+                role="combobox"
+              >
+                <label
+                  for="downshift-8-input"
+                  id="downshift-9-label"
                 />
+                <div
+                  class="sc-Axmtr jzhOwR"
+                  data-testid="SelectDropdownInput"
+                >
+                  <input
+                    aria-autocomplete="list"
+                    aria-controls="downshift-9-menu"
+                    aria-labelledby="downshift-9-label"
+                    autocomplete="off"
+                    class="sc-AxhCb biYFdn overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                    data-testid="SelectDropdownInput__input"
+                    id="downshift-8-input"
+                    name="type"
+                    placeholder="Select option"
+                    value=""
+                  />
+                </div>
                 <ul
-                  aria-labelledby="downshift-13-label"
-                  class="sc-fznyAO dPDaFu"
-                  id="downshift-13-menu"
+                  aria-labelledby="downshift-9-label"
+                  class="sc-fzplWN cDHryc"
+                  id="downshift-9-menu"
                   role="listbox"
-                  tabindex="-1"
                 />
               </div>
               <div
@@ -419,7 +435,7 @@ exports[`LinkCollection should remove links 1`] = `
 exports[`LinkCollection should render 1`] = `
 <DocumentFragment>
   <div
-    class="sc-fzqBZW eEiUFK flex flex-col font-normal"
+    class="sc-fzokOt lkSsTn flex flex-col font-normal"
     data-testid="LinkCollection"
   >
     <div
@@ -455,7 +471,7 @@ exports[`LinkCollection should render 1`] = `
 exports[`LinkCollection should select a specific link type 1`] = `
 <DocumentFragment>
   <div
-    class="sc-fzqBZW eEiUFK flex flex-col font-normal"
+    class="sc-fzokOt lkSsTn flex flex-col font-normal"
     data-testid="LinkCollection"
   >
     <div
@@ -519,22 +535,38 @@ exports[`LinkCollection should select a specific link type 1`] = `
             <div
               class="relative w-full cursor-pointer"
             >
-              <div>
-                <button
-                  aria-expanded="false"
-                  aria-haspopup="listbox"
-                  aria-labelledby="downshift-32-label downshift-32-toggle-button"
-                  class="sc-fzplWN jAabRP   "
-                  data-testid="select-list__toggle-button"
-                  id="downshift-32-toggle-button"
-                  type="button"
+              <div
+                aria-expanded="false"
+                aria-haspopup="listbox"
+                aria-owns="downshift-25-menu"
+                role="combobox"
+              >
+                <label
+                  for="downshift-24-input"
+                  id="downshift-25-label"
                 />
+                <div
+                  class="sc-Axmtr jzhOwR"
+                  data-testid="SelectDropdownInput"
+                >
+                  <input
+                    aria-autocomplete="list"
+                    aria-controls="downshift-25-menu"
+                    aria-labelledby="downshift-25-label"
+                    autocomplete="off"
+                    class="sc-AxhCb biYFdn overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                    data-testid="SelectDropdownInput__input"
+                    id="downshift-24-input"
+                    name="type"
+                    placeholder="Select option"
+                    value=""
+                  />
+                </div>
                 <ul
-                  aria-labelledby="downshift-32-label"
-                  class="sc-fznyAO dPDaFu"
-                  id="downshift-32-menu"
+                  aria-labelledby="downshift-25-label"
+                  class="sc-fzplWN cDHryc"
+                  id="downshift-25-menu"
                   role="listbox"
-                  tabindex="-1"
                 />
               </div>
               <div
@@ -586,7 +618,7 @@ exports[`LinkCollection should select a specific link type 1`] = `
         </button>
       </div>
       <div
-        class="sc-fznKkj iLZSgh mt-4"
+        class="sc-fznyAO eiMfGs mt-4"
         role="table"
       >
         <table
@@ -820,7 +852,7 @@ exports[`LinkCollection should select a specific link type 1`] = `
 exports[`LinkCollection should toggle open/close link collection 1`] = `
 <DocumentFragment>
   <div
-    class="sc-fzqBZW eEiUFK flex flex-col font-normal"
+    class="sc-fzokOt lkSsTn flex flex-col font-normal"
     data-testid="LinkCollection"
   >
     <div
diff --git a/src/domains/transaction/pages/SendEntityRegistration/__snapshots__/SendEntityRegistration.test.tsx.snap b/src/domains/transaction/pages/SendEntityRegistration/__snapshots__/SendEntityRegistration.test.tsx.snap
index 903850f8a2..c573ccc739 100644
--- a/src/domains/transaction/pages/SendEntityRegistration/__snapshots__/SendEntityRegistration.test.tsx.snap
+++ b/src/domains/transaction/pages/SendEntityRegistration/__snapshots__/SendEntityRegistration.test.tsx.snap
@@ -3722,7 +3722,7 @@ exports[`Registration should render registration form without selected wallet 1`
                       >
                         <div>
                           <button
-                            class="sc-fzqBkg hKoddb SelectAddress  "
+                            class="sc-fzolEj kkRTJY SelectAddress  "
                             data-testid="SelectAddress__wrapper"
                             type="button"
                           >
@@ -3786,22 +3786,38 @@ exports[`Registration should render registration form without selected wallet 1`
                         <div
                           class="relative w-full cursor-pointer"
                         >
-                          <div>
-                            <button
-                              aria-expanded="false"
-                              aria-haspopup="listbox"
-                              aria-labelledby="downshift-0-label downshift-0-toggle-button"
-                              class="sc-fznxKY ftvzgS   "
-                              data-testid="select-list__toggle-button"
-                              id="downshift-0-toggle-button"
-                              type="button"
+                          <div
+                            aria-expanded="false"
+                            aria-haspopup="listbox"
+                            aria-owns="downshift-1-menu"
+                            role="combobox"
+                          >
+                            <label
+                              for="downshift-0-input"
+                              id="downshift-1-label"
                             />
+                            <div
+                              class="sc-fzpjYC dHxzen"
+                              data-testid="SelectDropdownInput"
+                            >
+                              <input
+                                aria-autocomplete="list"
+                                aria-controls="downshift-1-menu"
+                                aria-labelledby="downshift-1-label"
+                                autocomplete="off"
+                                class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                                data-testid="SelectDropdownInput__input"
+                                id="downshift-0-input"
+                                name="registrationType"
+                                placeholder="Select option"
+                                value=""
+                              />
+                            </div>
                             <ul
-                              aria-labelledby="downshift-0-label"
-                              class="sc-fznMAR hjPwmz"
-                              id="downshift-0-menu"
+                              aria-labelledby="downshift-1-label"
+                              class="sc-fznxKY erNwxN"
+                              id="downshift-1-menu"
                               role="listbox"
-                              tabindex="-1"
                             />
                           </div>
                           <div
@@ -4283,7 +4299,7 @@ exports[`Registration should select cryptoasset first and see select address inp
                       >
                         <div>
                           <button
-                            class="sc-fzqBkg hKoddb SelectAddress  "
+                            class="sc-fzolEj kkRTJY SelectAddress  "
                             data-testid="SelectAddress__wrapper"
                             type="button"
                           >
@@ -4347,22 +4363,38 @@ exports[`Registration should select cryptoasset first and see select address inp
                         <div
                           class="relative w-full cursor-pointer"
                         >
-                          <div>
-                            <button
-                              aria-expanded="false"
-                              aria-haspopup="listbox"
-                              aria-labelledby="downshift-2-label downshift-2-toggle-button"
-                              class="sc-fznxKY ftvzgS   "
-                              data-testid="select-list__toggle-button"
-                              id="downshift-2-toggle-button"
-                              type="button"
+                          <div
+                            aria-expanded="false"
+                            aria-haspopup="listbox"
+                            aria-owns="downshift-5-menu"
+                            role="combobox"
+                          >
+                            <label
+                              for="downshift-4-input"
+                              id="downshift-5-label"
                             />
+                            <div
+                              class="sc-fzpjYC dHxzen"
+                              data-testid="SelectDropdownInput"
+                            >
+                              <input
+                                aria-autocomplete="list"
+                                aria-controls="downshift-5-menu"
+                                aria-labelledby="downshift-5-label"
+                                autocomplete="off"
+                                class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                                data-testid="SelectDropdownInput__input"
+                                id="downshift-4-input"
+                                name="registrationType"
+                                placeholder="Select option"
+                                value=""
+                              />
+                            </div>
                             <ul
-                              aria-labelledby="downshift-2-label"
-                              class="sc-fznMAR hjPwmz"
-                              id="downshift-2-menu"
+                              aria-labelledby="downshift-5-label"
+                              class="sc-fznxKY erNwxN"
+                              id="downshift-5-menu"
                               role="listbox"
-                              tabindex="-1"
                             />
                           </div>
                           <div
@@ -4868,7 +4900,7 @@ exports[`Registration should select cryptoasset with unavailable wallets and see
                       >
                         <div>
                           <button
-                            class="sc-fzqBkg hKoddb SelectAddress is-disabled "
+                            class="sc-fzolEj kkRTJY SelectAddress is-disabled "
                             data-testid="SelectAddress__wrapper"
                             disabled=""
                             type="button"
@@ -4933,22 +4965,38 @@ exports[`Registration should select cryptoasset with unavailable wallets and see
                         <div
                           class="relative w-full cursor-pointer"
                         >
-                          <div>
-                            <button
-                              aria-expanded="false"
-                              aria-haspopup="listbox"
-                              aria-labelledby="downshift-6-label downshift-6-toggle-button"
-                              class="sc-fznxKY ftvzgS   "
-                              data-testid="select-list__toggle-button"
-                              id="downshift-6-toggle-button"
-                              type="button"
+                          <div
+                            aria-expanded="false"
+                            aria-haspopup="listbox"
+                            aria-owns="downshift-13-menu"
+                            role="combobox"
+                          >
+                            <label
+                              for="downshift-12-input"
+                              id="downshift-13-label"
                             />
+                            <div
+                              class="sc-fzpjYC dHxzen"
+                              data-testid="SelectDropdownInput"
+                            >
+                              <input
+                                aria-autocomplete="list"
+                                aria-controls="downshift-13-menu"
+                                aria-labelledby="downshift-13-label"
+                                autocomplete="off"
+                                class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                                data-testid="SelectDropdownInput__input"
+                                id="downshift-12-input"
+                                name="registrationType"
+                                placeholder="Select option"
+                                value=""
+                              />
+                            </div>
                             <ul
-                              aria-labelledby="downshift-6-label"
-                              class="sc-fznMAR hjPwmz"
-                              id="downshift-6-menu"
+                              aria-labelledby="downshift-13-label"
+                              class="sc-fznxKY erNwxN"
+                              id="downshift-13-menu"
                               role="listbox"
-                              tabindex="-1"
                             />
                           </div>
                           <div
diff --git a/src/domains/transaction/pages/SendEntityUpdate/__snapshots__/SendEntityUpdate.test.tsx.snap b/src/domains/transaction/pages/SendEntityUpdate/__snapshots__/SendEntityUpdate.test.tsx.snap
index 73efa2376a..1afd82c5d5 100644
--- a/src/domains/transaction/pages/SendEntityUpdate/__snapshots__/SendEntityUpdate.test.tsx.snap
+++ b/src/domains/transaction/pages/SendEntityUpdate/__snapshots__/SendEntityUpdate.test.tsx.snap
@@ -415,7 +415,7 @@ exports[`SendEntityUpdate should fail validation on description textarea in firs
                             class="font-semibold"
                           >
                             <div
-                              class="sc-fzqBkg jagFyb flex flex-col font-normal"
+                              class="sc-fzolEj gfKaqI flex flex-col font-normal"
                               data-testid="LinkCollection"
                             >
                               <div
@@ -459,7 +459,7 @@ exports[`SendEntityUpdate should fail validation on description textarea in firs
                             class="font-semibold"
                           >
                             <div
-                              class="sc-fzqBkg jagFyb flex flex-col font-normal"
+                              class="sc-fzolEj gfKaqI flex flex-col font-normal"
                               data-testid="LinkCollection"
                             >
                               <div
@@ -503,7 +503,7 @@ exports[`SendEntityUpdate should fail validation on description textarea in firs
                             class="font-semibold"
                           >
                             <div
-                              class="sc-fzqBkg jagFyb flex flex-col font-normal"
+                              class="sc-fzolEj gfKaqI flex flex-col font-normal"
                               data-testid="LinkCollection"
                             >
                               <div
@@ -1048,7 +1048,7 @@ exports[`SendEntityUpdate should fail validation on description textarea in firs
                             class="font-semibold"
                           >
                             <div
-                              class="sc-fzqBkg jagFyb flex flex-col font-normal"
+                              class="sc-fzolEj gfKaqI flex flex-col font-normal"
                               data-testid="LinkCollection"
                             >
                               <div
@@ -1092,7 +1092,7 @@ exports[`SendEntityUpdate should fail validation on description textarea in firs
                             class="font-semibold"
                           >
                             <div
-                              class="sc-fzqBkg jagFyb flex flex-col font-normal"
+                              class="sc-fzolEj gfKaqI flex flex-col font-normal"
                               data-testid="LinkCollection"
                             >
                               <div
@@ -1136,7 +1136,7 @@ exports[`SendEntityUpdate should fail validation on description textarea in firs
                             class="font-semibold"
                           >
                             <div
-                              class="sc-fzqBkg jagFyb flex flex-col font-normal"
+                              class="sc-fzolEj gfKaqI flex flex-col font-normal"
                               data-testid="LinkCollection"
                             >
                               <div
@@ -1681,7 +1681,7 @@ exports[`SendEntityUpdate should fail validation on description textarea in firs
                             class="font-semibold"
                           >
                             <div
-                              class="sc-fzqBkg jagFyb flex flex-col font-normal"
+                              class="sc-fzolEj gfKaqI flex flex-col font-normal"
                               data-testid="LinkCollection"
                             >
                               <div
@@ -1725,7 +1725,7 @@ exports[`SendEntityUpdate should fail validation on description textarea in firs
                             class="font-semibold"
                           >
                             <div
-                              class="sc-fzqBkg jagFyb flex flex-col font-normal"
+                              class="sc-fzolEj gfKaqI flex flex-col font-normal"
                               data-testid="LinkCollection"
                             >
                               <div
@@ -1769,7 +1769,7 @@ exports[`SendEntityUpdate should fail validation on description textarea in firs
                             class="font-semibold"
                           >
                             <div
-                              class="sc-fzqBkg jagFyb flex flex-col font-normal"
+                              class="sc-fzolEj gfKaqI flex flex-col font-normal"
                               data-testid="LinkCollection"
                             >
                               <div
@@ -2314,7 +2314,7 @@ exports[`SendEntityUpdate should fail validation on display name input in first
                             class="font-semibold"
                           >
                             <div
-                              class="sc-fzqBkg jagFyb flex flex-col font-normal"
+                              class="sc-fzolEj gfKaqI flex flex-col font-normal"
                               data-testid="LinkCollection"
                             >
                               <div
@@ -2358,7 +2358,7 @@ exports[`SendEntityUpdate should fail validation on display name input in first
                             class="font-semibold"
                           >
                             <div
-                              class="sc-fzqBkg jagFyb flex flex-col font-normal"
+                              class="sc-fzolEj gfKaqI flex flex-col font-normal"
                               data-testid="LinkCollection"
                             >
                               <div
@@ -2402,7 +2402,7 @@ exports[`SendEntityUpdate should fail validation on display name input in first
                             class="font-semibold"
                           >
                             <div
-                              class="sc-fzqBkg jagFyb flex flex-col font-normal"
+                              class="sc-fzolEj gfKaqI flex flex-col font-normal"
                               data-testid="LinkCollection"
                             >
                               <div
@@ -2947,7 +2947,7 @@ exports[`SendEntityUpdate should fail validation on display name input in first
                             class="font-semibold"
                           >
                             <div
-                              class="sc-fzqBkg jagFyb flex flex-col font-normal"
+                              class="sc-fzolEj gfKaqI flex flex-col font-normal"
                               data-testid="LinkCollection"
                             >
                               <div
@@ -2991,7 +2991,7 @@ exports[`SendEntityUpdate should fail validation on display name input in first
                             class="font-semibold"
                           >
                             <div
-                              class="sc-fzqBkg jagFyb flex flex-col font-normal"
+                              class="sc-fzolEj gfKaqI flex flex-col font-normal"
                               data-testid="LinkCollection"
                             >
                               <div
@@ -3035,7 +3035,7 @@ exports[`SendEntityUpdate should fail validation on display name input in first
                             class="font-semibold"
                           >
                             <div
-                              class="sc-fzqBkg jagFyb flex flex-col font-normal"
+                              class="sc-fzolEj gfKaqI flex flex-col font-normal"
                               data-testid="LinkCollection"
                             >
                               <div
@@ -3580,7 +3580,7 @@ exports[`SendEntityUpdate should fail validation on display name input in first
                             class="font-semibold"
                           >
                             <div
-                              class="sc-fzqBkg jagFyb flex flex-col font-normal"
+                              class="sc-fzolEj gfKaqI flex flex-col font-normal"
                               data-testid="LinkCollection"
                             >
                               <div
@@ -3624,7 +3624,7 @@ exports[`SendEntityUpdate should fail validation on display name input in first
                             class="font-semibold"
                           >
                             <div
-                              class="sc-fzqBkg jagFyb flex flex-col font-normal"
+                              class="sc-fzolEj gfKaqI flex flex-col font-normal"
                               data-testid="LinkCollection"
                             >
                               <div
@@ -3668,7 +3668,7 @@ exports[`SendEntityUpdate should fail validation on display name input in first
                             class="font-semibold"
                           >
                             <div
-                              class="sc-fzqBkg jagFyb flex flex-col font-normal"
+                              class="sc-fzolEj gfKaqI flex flex-col font-normal"
                               data-testid="LinkCollection"
                             >
                               <div
@@ -4213,7 +4213,7 @@ exports[`SendEntityUpdate should fail validation on website input in first step
                             class="font-semibold"
                           >
                             <div
-                              class="sc-fzqBkg jagFyb flex flex-col font-normal"
+                              class="sc-fzolEj gfKaqI flex flex-col font-normal"
                               data-testid="LinkCollection"
                             >
                               <div
@@ -4257,7 +4257,7 @@ exports[`SendEntityUpdate should fail validation on website input in first step
                             class="font-semibold"
                           >
                             <div
-                              class="sc-fzqBkg jagFyb flex flex-col font-normal"
+                              class="sc-fzolEj gfKaqI flex flex-col font-normal"
                               data-testid="LinkCollection"
                             >
                               <div
@@ -4301,7 +4301,7 @@ exports[`SendEntityUpdate should fail validation on website input in first step
                             class="font-semibold"
                           >
                             <div
-                              class="sc-fzqBkg jagFyb flex flex-col font-normal"
+                              class="sc-fzolEj gfKaqI flex flex-col font-normal"
                               data-testid="LinkCollection"
                             >
                               <div
@@ -5118,7 +5118,7 @@ exports[`SendEntityUpdate should render 2nd step 1`] = `
                                 class="flex flex-col w-1/2 justify-center px-4 py-2"
                               >
                                 <span
-                                  class="sc-fzqPZZ eqKIrg"
+                                  class="sc-fzqBkg eiTlXa"
                                 >
                                   Transaction Amount
                                 </span>
@@ -5133,7 +5133,7 @@ exports[`SendEntityUpdate should render 2nd step 1`] = `
                                 class="flex flex-col w-1/2 justify-center px-4 py-2 text-right"
                               >
                                 <span
-                                  class="sc-fzqPZZ eqKIrg"
+                                  class="sc-fzqBkg eiTlXa"
                                 >
                                   Transaction Fee
                                 </span>
@@ -5167,7 +5167,7 @@ exports[`SendEntityUpdate should render 2nd step 1`] = `
                             class="flex flex-col items-center py-6 border-t rounded-b-lg border-theme-neutral-300 justfiy-center bg-theme-neutral-contrast"
                           >
                             <span
-                              class="sc-fzqPZZ eqKIrg"
+                              class="sc-fzqBkg eiTlXa"
                             >
                               Total Amount
                             </span>
@@ -6466,7 +6466,7 @@ exports[`SendEntityUpdate should should go back 1`] = `
                             class="font-semibold"
                           >
                             <div
-                              class="sc-fzqBkg jagFyb flex flex-col font-normal"
+                              class="sc-fzolEj gfKaqI flex flex-col font-normal"
                               data-testid="LinkCollection"
                             >
                               <div
@@ -6510,7 +6510,7 @@ exports[`SendEntityUpdate should should go back 1`] = `
                             class="font-semibold"
                           >
                             <div
-                              class="sc-fzqBkg jagFyb flex flex-col font-normal"
+                              class="sc-fzolEj gfKaqI flex flex-col font-normal"
                               data-testid="LinkCollection"
                             >
                               <div
@@ -6554,7 +6554,7 @@ exports[`SendEntityUpdate should should go back 1`] = `
                             class="font-semibold"
                           >
                             <div
-                              class="sc-fzqBkg jagFyb flex flex-col font-normal"
+                              class="sc-fzolEj gfKaqI flex flex-col font-normal"
                               data-testid="LinkCollection"
                             >
                               <div

From 9a3596a7e9229290f5510b698614394f7d1611c6 Mon Sep 17 00:00:00 2001
From: brenopolanski <breno.polanski@gmail.com>
Date: Tue, 13 Oct 2020 20:12:56 -0300
Subject: [PATCH 07/13] test: fix all tests

---
 .../SelectDropdown/SelectDropdown.test.tsx    |   36 +-
 .../SelectDropdown/SelectDropdown.tsx         |   11 +-
 .../SelectDropdown.test.tsx.snap              |   14 +-
 .../__snapshots__/ContactUs.test.tsx.snap     |    2 +-
 .../CreateProfile/CreateProfile.test.tsx      |   40 +-
 .../__snapshots__/CreateProfile.test.tsx.snap | 1472 +++++++++++-
 .../setting/pages/Settings/Settings.test.tsx  |   81 +-
 .../__snapshots__/Settings.test.tsx.snap      | 2033 ++++-------------
 .../LinkCollection/LinkCollection.test.tsx    |   28 +-
 .../LinkCollection.test.tsx.snap              |  111 +-
 .../SendEntityRegistration.test.tsx           |   76 +-
 .../SendEntityRegistration.test.tsx.snap      |  278 ++-
 12 files changed, 2211 insertions(+), 1971 deletions(-)

diff --git a/src/app/components/SelectDropdown/SelectDropdown.test.tsx b/src/app/components/SelectDropdown/SelectDropdown.test.tsx
index fd6c420584..9aadf67bd2 100644
--- a/src/app/components/SelectDropdown/SelectDropdown.test.tsx
+++ b/src/app/components/SelectDropdown/SelectDropdown.test.tsx
@@ -59,10 +59,10 @@ describe("SelectDropdown", () => {
 		const options = [{ label: "Option 1", value: "1" }];
 		const { getByTestId } = render(<Select options={options} defaultValue="3" />);
 
-		const toggle = getByTestId("select-list__toggle-button");
+		const selectDropdown = getByTestId("SelectDropdownInput__input");
 
 		act(() => {
-			fireEvent.click(toggle);
+			fireEvent.change(selectDropdown, { target: { value: "Opt" } });
 		});
 
 		const firstOption = getByTestId("select-list__toggle-option-0");
@@ -77,10 +77,10 @@ describe("SelectDropdown", () => {
 		const options = [{ label: "Option 1", value: "1" }];
 		const { getByTestId } = render(<Select options={options} defaultValue="3" />);
 
-		const toggle = getByTestId("select-list__toggle-button");
+		const selectDropdown = getByTestId("SelectDropdownInput__input");
 
 		act(() => {
-			fireEvent.click(toggle);
+			fireEvent.change(selectDropdown, { target: { value: "Opt" } });
 		});
 
 		const firstOption = getByTestId("select-list__toggle-option-0");
@@ -97,22 +97,18 @@ describe("SelectDropdown", () => {
 		const options = [{ label: "Option 1", value: "1" }];
 		const { getByTestId } = render(<Select options={options} defaultValue="3" />);
 
-		const toggle = getByTestId("select-list__toggle-button");
+		const selectDropdown = getByTestId("SelectDropdownInput__input");
 
 		act(() => {
-			fireEvent.click(toggle);
+			fireEvent.change(selectDropdown, { target: { value: "Opt" } });
 		});
 
-		const firstOption = getByTestId("select-list__toggle-option-0");
-		expect(firstOption).toBeTruthy();
-
 		act(() => {
-			fireEvent.mouseOver(firstOption);
+			fireEvent.keyDown(selectDropdown, { key: "Tab", code: 9 });
 		});
 
-		act(() => {
-			fireEvent.keyDown(toggle, { key: "ArrowDown", code: 40 });
-		});
+		const firstOption = getByTestId("select-list__toggle-option-0");
+		expect(firstOption).toBeTruthy();
 
 		expect(firstOption).toHaveClass("is-highlighted");
 	});
@@ -121,10 +117,18 @@ describe("SelectDropdown", () => {
 		const options = [{ label: "Option 1", value: "1" }];
 		const { getByTestId } = render(<Select options={options} defaultValue="3" />);
 
-		const toggle = getByTestId("select-list__toggle-button");
+		const selectDropdown = getByTestId("SelectDropdownInput__input");
+
+		act(() => {
+			fireEvent.change(selectDropdown, { target: { value: "Opt" } });
+		});
+
+		act(() => {
+			fireEvent.keyDown(selectDropdown, { key: "Tab", code: 9 });
+		});
 
 		act(() => {
-			fireEvent.click(toggle);
+			fireEvent.keyDown(selectDropdown, { key: "Backspace", code: 8 });
 		});
 
 		const firstOption = getByTestId("select-list__toggle-option-0");
@@ -135,7 +139,7 @@ describe("SelectDropdown", () => {
 		});
 
 		act(() => {
-			fireEvent.keyDown(toggle, { key: "ArrowDown", code: 40 });
+			fireEvent.keyDown(selectDropdown, { key: "ArrowDown", code: 40 });
 		});
 
 		expect(firstOption).toHaveClass("is-highlighted");
diff --git a/src/app/components/SelectDropdown/SelectDropdown.tsx b/src/app/components/SelectDropdown/SelectDropdown.tsx
index 103ec6760d..2bb93ef351 100755
--- a/src/app/components/SelectDropdown/SelectDropdown.tsx
+++ b/src/app/components/SelectDropdown/SelectDropdown.tsx
@@ -30,7 +30,7 @@ type SelectDropdownProps = {
 	onSelectedItemChange: any;
 } & React.InputHTMLAttributes<any>;
 
-export const itemToString = (item: Option | null) => item?.label || "";
+const itemToString = (item: Option | null) => item?.label || "";
 
 const SelectDropdown = ({
 	options,
@@ -98,7 +98,7 @@ const SelectDropdown = ({
 	const data = isTyping ? items : options;
 
 	return (
-		<div className="relative w-full cursor-pointer">
+		<div className="relative w-full">
 			<div {...getComboboxProps()}>
 				<label {...getLabelProps()} />
 				<SelectDropdownInput
@@ -189,14 +189,17 @@ export const Select = React.forwardRef<HTMLInputElement, SelectProps>(
 					readOnly
 				/>
 				<SelectDropdown
-					disabled={disabled}
 					options={options}
 					defaultSelectedItem={defaultSelectedItem}
 					placeholder={placeholder}
+					disabled={disabled}
 					isInvalid={isInvalidField}
 					onSelectedItemChange={({ selectedItem }: { selectedItem: Option }) => {
 						setSelected(selectedItem);
-						onChange?.(selectedItem);
+
+						if (selectedItem) {
+							onChange?.(selectedItem);
+						}
 					}}
 				/>
 			</div>
diff --git a/src/app/components/SelectDropdown/__snapshots__/SelectDropdown.test.tsx.snap b/src/app/components/SelectDropdown/__snapshots__/SelectDropdown.test.tsx.snap
index 85111992e2..6b20b04001 100644
--- a/src/app/components/SelectDropdown/__snapshots__/SelectDropdown.test.tsx.snap
+++ b/src/app/components/SelectDropdown/__snapshots__/SelectDropdown.test.tsx.snap
@@ -13,7 +13,7 @@ exports[`SelectDropdown should render 1`] = `
       value=""
     />
     <div
-      class="relative w-full cursor-pointer"
+      class="relative w-full"
     >
       <div
         aria-expanded="false"
@@ -79,7 +79,7 @@ exports[`SelectDropdown should render disabled 1`] = `
       value=""
     />
     <div
-      class="relative w-full cursor-pointer"
+      class="relative w-full"
     >
       <div
         aria-expanded="false"
@@ -147,7 +147,7 @@ exports[`SelectDropdown should render invalid 1`] = `
       value=""
     />
     <div
-      class="relative w-full cursor-pointer"
+      class="relative w-full"
     >
       <div
         aria-expanded="false"
@@ -213,7 +213,7 @@ exports[`SelectDropdown should render with empty options 1`] = `
       value=""
     />
     <div
-      class="relative w-full cursor-pointer"
+      class="relative w-full"
     >
       <div
         aria-expanded="false"
@@ -279,7 +279,7 @@ exports[`SelectDropdown should render with initial default value 1`] = `
       value="3"
     />
     <div
-      class="relative w-full cursor-pointer"
+      class="relative w-full"
     >
       <div
         aria-expanded="false"
@@ -351,7 +351,7 @@ exports[`SelectDropdown should render with options values as numbers 1`] = `
       value=""
     />
     <div
-      class="relative w-full cursor-pointer"
+      class="relative w-full"
     >
       <div
         aria-expanded="false"
@@ -417,7 +417,7 @@ exports[`SelectDropdown should render with wrong default value 1`] = `
       value=""
     />
     <div
-      class="relative w-full cursor-pointer"
+      class="relative w-full"
     >
       <div
         aria-expanded="false"
diff --git a/src/domains/help/components/ContactUs/__snapshots__/ContactUs.test.tsx.snap b/src/domains/help/components/ContactUs/__snapshots__/ContactUs.test.tsx.snap
index 75874b3d29..812f1c3ca9 100644
--- a/src/domains/help/components/ContactUs/__snapshots__/ContactUs.test.tsx.snap
+++ b/src/domains/help/components/ContactUs/__snapshots__/ContactUs.test.tsx.snap
@@ -202,7 +202,7 @@ exports[`ContactUs should render a modal 1`] = `
                   value=""
                 />
                 <div
-                  class="relative w-full cursor-pointer"
+                  class="relative w-full"
                 >
                   <div
                     aria-expanded="false"
diff --git a/src/domains/profile/pages/CreateProfile/CreateProfile.test.tsx b/src/domains/profile/pages/CreateProfile/CreateProfile.test.tsx
index 91b692287d..ef93bd553f 100755
--- a/src/domains/profile/pages/CreateProfile/CreateProfile.test.tsx
+++ b/src/domains/profile/pages/CreateProfile/CreateProfile.test.tsx
@@ -98,7 +98,13 @@ describe("CreateProfile", () => {
 		});
 
 		fireEvent.input(getAllByTestId("Input")[0], { target: { value: "test profile 1" } });
-		fireEvent.click(getAllByTestId("select-list__toggle-button")[0]);
+
+		const selectDropdown = getByTestId("SelectDropdownInput__input");
+
+		await act(async () => {
+			fireEvent.change(selectDropdown, { target: { value: "BTC" } });
+		});
+
 		fireEvent.click(getByTestId("select-list__toggle-option-0"));
 
 		await act(async () => {
@@ -161,7 +167,13 @@ describe("CreateProfile", () => {
 		});
 
 		fireEvent.input(getAllByTestId("Input")[0], { target: { value: "test profile 1" } });
-		fireEvent.click(getAllByTestId("select-list__toggle-button")[0]);
+
+		const selectDropdown = getByTestId("SelectDropdownInput__input");
+
+		await act(async () => {
+			fireEvent.change(selectDropdown, { target: { value: "BTC" } });
+		});
+
 		fireEvent.click(getByTestId("select-list__toggle-option-0"));
 
 		await act(async () => {
@@ -184,7 +196,13 @@ describe("CreateProfile", () => {
 
 		fireEvent.input(getAllByTestId("Input")[0], { target: { value: "test profile 3" } });
 		fireEvent.input(getAllByTestId("Input")[1], { target: { value: "test password" } });
-		fireEvent.click(getAllByTestId("select-list__toggle-button")[0]);
+
+		const selectDropdown = getByTestId("SelectDropdownInput__input");
+
+		await act(async () => {
+			fireEvent.change(selectDropdown, { target: { value: "BTC" } });
+		});
+
 		fireEvent.click(getByTestId("select-list__toggle-option-0"));
 
 		await act(async () => {
@@ -219,7 +237,13 @@ describe("CreateProfile", () => {
 		});
 
 		fireEvent.input(getAllByTestId("Input")[0], { target: { value: "test profile 4" } });
-		fireEvent.click(getAllByTestId("select-list__toggle-button")[0]);
+
+		const selectDropdown = getByTestId("SelectDropdownInput__input");
+
+		await act(async () => {
+			fireEvent.change(selectDropdown, { target: { value: "BTC" } });
+		});
+
 		fireEvent.click(getByTestId("select-list__toggle-option-0"));
 
 		await act(async () => {
@@ -252,7 +276,13 @@ describe("CreateProfile", () => {
 		expect(showOpenDialogMock).toHaveBeenCalledWith(showOpenDialogParams);
 
 		fireEvent.input(getAllByTestId("Input")[0], { target: { value: "test profile 5" } });
-		fireEvent.click(getAllByTestId("select-list__toggle-button")[0]);
+
+		const selectDropdown = getByTestId("SelectDropdownInput__input");
+
+		await act(async () => {
+			fireEvent.change(selectDropdown, { target: { value: "BTC" } });
+		});
+
 		fireEvent.click(getByTestId("select-list__toggle-option-0"));
 
 		await act(async () => {
diff --git a/src/domains/profile/pages/CreateProfile/__snapshots__/CreateProfile.test.tsx.snap b/src/domains/profile/pages/CreateProfile/__snapshots__/CreateProfile.test.tsx.snap
index 3f18e5f2d9..7a87831f20 100644
--- a/src/domains/profile/pages/CreateProfile/__snapshots__/CreateProfile.test.tsx.snap
+++ b/src/domains/profile/pages/CreateProfile/__snapshots__/CreateProfile.test.tsx.snap
@@ -137,7 +137,7 @@ exports[`CreateProfile should not create new profile if profile name exists 1`]
                           class="relative w-24 h-24 rounded bg-theme-neutral-contrast"
                         >
                           <div
-                            class="sc-fzoXWK JKhnC"
+                            class="sc-fzoNJl fmQYQu"
                           >
                             <img
                               alt="Profile avatar"
@@ -245,33 +245,289 @@ exports[`CreateProfile should not create new profile if profile name exists 1`]
                         value="BTC"
                       />
                       <div
-                        class="relative w-full cursor-pointer"
+                        class="relative w-full"
                       >
-                        <div>
-                          <button
-                            aria-expanded="false"
-                            aria-haspopup="listbox"
-                            aria-labelledby="downshift-16-label downshift-16-toggle-button"
-                            class="sc-fzoyTs buZKoP  is-selected "
-                            data-testid="select-list__toggle-button"
-                            id="downshift-16-toggle-button"
-                            type="button"
+                        <div
+                          aria-expanded="true"
+                          aria-haspopup="listbox"
+                          aria-owns="downshift-35-menu"
+                          role="combobox"
+                        >
+                          <label
+                            for="downshift-34-input"
+                            id="downshift-35-label"
+                          />
+                          <div
+                            class="sc-AxmLO kuiknc"
+                            data-testid="SelectDropdownInput"
                           >
-                            BTC (Ƀ)
-                          </button>
+                            <span
+                              class="sc-AxgMl mMYyr py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+                              data-testid="SelectDropdownInput__typeahead"
+                            >
+                              BTC (Ƀ)
+                            </span>
+                            <input
+                              aria-activedescendant="downshift-35-item-0"
+                              aria-autocomplete="list"
+                              aria-controls="downshift-35-menu"
+                              aria-labelledby="downshift-35-label"
+                              autocomplete="off"
+                              class="sc-AxhUy jqmzti overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                              data-testid="SelectDropdownInput__input"
+                              id="downshift-34-input"
+                              name="currency"
+                              placeholder="Select Currency"
+                              value="BTC (Ƀ)"
+                            />
+                          </div>
                           <ul
-                            aria-labelledby="downshift-16-label"
-                            class="sc-fzoNJl gPmoPk"
-                            id="downshift-16-menu"
+                            aria-labelledby="downshift-35-label"
+                            class="sc-fzoyTs bGjmHs is-open"
+                            id="downshift-35-menu"
                             role="listbox"
-                            tabindex="-1"
-                          />
+                          >
+                            <li
+                              aria-selected="true"
+                              class="select-list-option is-highlighted"
+                              data-testid="select-list__toggle-option-0"
+                              id="downshift-35-item-0"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                BTC (Ƀ)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-1"
+                              id="downshift-35-item-1"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                ETH (Ξ)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-2"
+                              id="downshift-35-item-2"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                LTC (Ł)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-3"
+                              id="downshift-35-item-3"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                AUD (A$)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-4"
+                              id="downshift-35-item-4"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                BRL (R$)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-5"
+                              id="downshift-35-item-5"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                CAD (C$)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-6"
+                              id="downshift-35-item-6"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                CHF (CHF)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-7"
+                              id="downshift-35-item-7"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                CNY (¥)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-8"
+                              id="downshift-35-item-8"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                EUR (€)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-9"
+                              id="downshift-35-item-9"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                GBP (£)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-10"
+                              id="downshift-35-item-10"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                HKD (HK$)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-11"
+                              id="downshift-35-item-11"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                IDR (IDR)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-12"
+                              id="downshift-35-item-12"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                INR (₹)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-13"
+                              id="downshift-35-item-13"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                JPY (¥)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-14"
+                              id="downshift-35-item-14"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                KRW (₩)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-15"
+                              id="downshift-35-item-15"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                MXN (MX$)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-16"
+                              id="downshift-35-item-16"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                RUB (₽)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-17"
+                              id="downshift-35-item-17"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                USD ($)
+                              </div>
+                            </li>
+                          </ul>
                         </div>
                         <div
                           class="sc-AxgMl sc-Axmtr hWILTO w-10 pointer-events-none text-theme-neutral"
                         >
                           <div
-                            class="sc-AxhCb jfKWih"
+                            class="sc-AxhCb jfKWih transform rotate-180"
                             height="5"
                             width="7"
                           >
@@ -505,7 +761,7 @@ exports[`CreateProfile should not upload avatar image 1`] = `
                           class="relative w-24 h-24 rounded bg-theme-neutral-contrast"
                         >
                           <div
-                            class="sc-fzoXWK JKhnC"
+                            class="sc-fzoNJl fmQYQu"
                           >
                             <img
                               alt="Profile avatar"
@@ -613,33 +869,289 @@ exports[`CreateProfile should not upload avatar image 1`] = `
                         value="BTC"
                       />
                       <div
-                        class="relative w-full cursor-pointer"
+                        class="relative w-full"
                       >
-                        <div>
-                          <button
-                            aria-expanded="false"
-                            aria-haspopup="listbox"
-                            aria-labelledby="downshift-52-label downshift-52-toggle-button"
-                            class="sc-fzoyTs buZKoP  is-selected "
-                            data-testid="select-list__toggle-button"
-                            id="downshift-52-toggle-button"
-                            type="button"
+                        <div
+                          aria-expanded="true"
+                          aria-haspopup="listbox"
+                          aria-owns="downshift-111-menu"
+                          role="combobox"
+                        >
+                          <label
+                            for="downshift-110-input"
+                            id="downshift-111-label"
+                          />
+                          <div
+                            class="sc-AxmLO kuiknc"
+                            data-testid="SelectDropdownInput"
                           >
-                            BTC (Ƀ)
-                          </button>
+                            <span
+                              class="sc-AxgMl mMYyr py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+                              data-testid="SelectDropdownInput__typeahead"
+                            >
+                              BTC (Ƀ)
+                            </span>
+                            <input
+                              aria-activedescendant="downshift-111-item-0"
+                              aria-autocomplete="list"
+                              aria-controls="downshift-111-menu"
+                              aria-labelledby="downshift-111-label"
+                              autocomplete="off"
+                              class="sc-AxhUy jqmzti overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                              data-testid="SelectDropdownInput__input"
+                              id="downshift-110-input"
+                              name="currency"
+                              placeholder="Select Currency"
+                              value="BTC (Ƀ)"
+                            />
+                          </div>
                           <ul
-                            aria-labelledby="downshift-52-label"
-                            class="sc-fzoNJl gPmoPk"
-                            id="downshift-52-menu"
+                            aria-labelledby="downshift-111-label"
+                            class="sc-fzoyTs bGjmHs is-open"
+                            id="downshift-111-menu"
                             role="listbox"
-                            tabindex="-1"
-                          />
+                          >
+                            <li
+                              aria-selected="true"
+                              class="select-list-option is-highlighted"
+                              data-testid="select-list__toggle-option-0"
+                              id="downshift-111-item-0"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                BTC (Ƀ)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-1"
+                              id="downshift-111-item-1"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                ETH (Ξ)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-2"
+                              id="downshift-111-item-2"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                LTC (Ł)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-3"
+                              id="downshift-111-item-3"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                AUD (A$)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-4"
+                              id="downshift-111-item-4"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                BRL (R$)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-5"
+                              id="downshift-111-item-5"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                CAD (C$)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-6"
+                              id="downshift-111-item-6"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                CHF (CHF)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-7"
+                              id="downshift-111-item-7"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                CNY (¥)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-8"
+                              id="downshift-111-item-8"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                EUR (€)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-9"
+                              id="downshift-111-item-9"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                GBP (£)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-10"
+                              id="downshift-111-item-10"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                HKD (HK$)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-11"
+                              id="downshift-111-item-11"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                IDR (IDR)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-12"
+                              id="downshift-111-item-12"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                INR (₹)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-13"
+                              id="downshift-111-item-13"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                JPY (¥)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-14"
+                              id="downshift-111-item-14"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                KRW (₩)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-15"
+                              id="downshift-111-item-15"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                MXN (MX$)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-16"
+                              id="downshift-111-item-16"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                RUB (₽)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-17"
+                              id="downshift-111-item-17"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                USD ($)
+                              </div>
+                            </li>
+                          </ul>
                         </div>
                         <div
                           class="sc-AxgMl sc-Axmtr hWILTO w-10 pointer-events-none text-theme-neutral"
                         >
                           <div
-                            class="sc-AxhCb jfKWih"
+                            class="sc-AxhCb jfKWih transform rotate-180"
                             height="5"
                             width="7"
                           >
@@ -969,7 +1481,7 @@ exports[`CreateProfile should render 1`] = `
                         value=""
                       />
                       <div
-                        class="relative w-full cursor-pointer"
+                        class="relative w-full"
                       >
                         <div
                           aria-expanded="false"
@@ -1243,7 +1755,7 @@ exports[`CreateProfile should store profile 1`] = `
                           class="relative w-24 h-24 rounded bg-theme-neutral-contrast"
                         >
                           <div
-                            class="sc-fzoXWK JKhnC"
+                            class="sc-fzoNJl fmQYQu"
                           >
                             <img
                               alt="Profile avatar"
@@ -1362,33 +1874,289 @@ exports[`CreateProfile should store profile 1`] = `
                         value="BTC"
                       />
                       <div
-                        class="relative w-full cursor-pointer"
+                        class="relative w-full"
                       >
-                        <div>
-                          <button
-                            aria-expanded="false"
-                            aria-haspopup="listbox"
-                            aria-labelledby="downshift-1-label downshift-1-toggle-button"
-                            class="sc-fzoyTs buZKoP  is-selected "
-                            data-testid="select-list__toggle-button"
-                            id="downshift-1-toggle-button"
-                            type="button"
+                        <div
+                          aria-expanded="true"
+                          aria-haspopup="listbox"
+                          aria-owns="downshift-5-menu"
+                          role="combobox"
+                        >
+                          <label
+                            for="downshift-4-input"
+                            id="downshift-5-label"
+                          />
+                          <div
+                            class="sc-AxmLO kuiknc"
+                            data-testid="SelectDropdownInput"
                           >
-                            BTC (Ƀ)
-                          </button>
+                            <span
+                              class="sc-AxgMl mMYyr py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+                              data-testid="SelectDropdownInput__typeahead"
+                            >
+                              BTC (Ƀ)
+                            </span>
+                            <input
+                              aria-activedescendant="downshift-5-item-0"
+                              aria-autocomplete="list"
+                              aria-controls="downshift-5-menu"
+                              aria-labelledby="downshift-5-label"
+                              autocomplete="off"
+                              class="sc-AxhUy jqmzti overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                              data-testid="SelectDropdownInput__input"
+                              id="downshift-4-input"
+                              name="currency"
+                              placeholder="Select Currency"
+                              value="BTC (Ƀ)"
+                            />
+                          </div>
                           <ul
-                            aria-labelledby="downshift-1-label"
-                            class="sc-fzoNJl gPmoPk"
-                            id="downshift-1-menu"
+                            aria-labelledby="downshift-5-label"
+                            class="sc-fzoyTs bGjmHs is-open"
+                            id="downshift-5-menu"
                             role="listbox"
-                            tabindex="-1"
-                          />
+                          >
+                            <li
+                              aria-selected="true"
+                              class="select-list-option is-highlighted"
+                              data-testid="select-list__toggle-option-0"
+                              id="downshift-5-item-0"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                BTC (Ƀ)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-1"
+                              id="downshift-5-item-1"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                ETH (Ξ)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-2"
+                              id="downshift-5-item-2"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                LTC (Ł)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-3"
+                              id="downshift-5-item-3"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                AUD (A$)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-4"
+                              id="downshift-5-item-4"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                BRL (R$)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-5"
+                              id="downshift-5-item-5"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                CAD (C$)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-6"
+                              id="downshift-5-item-6"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                CHF (CHF)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-7"
+                              id="downshift-5-item-7"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                CNY (¥)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-8"
+                              id="downshift-5-item-8"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                EUR (€)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-9"
+                              id="downshift-5-item-9"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                GBP (£)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-10"
+                              id="downshift-5-item-10"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                HKD (HK$)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-11"
+                              id="downshift-5-item-11"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                IDR (IDR)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-12"
+                              id="downshift-5-item-12"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                INR (₹)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-13"
+                              id="downshift-5-item-13"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                JPY (¥)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-14"
+                              id="downshift-5-item-14"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                KRW (₩)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-15"
+                              id="downshift-5-item-15"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                MXN (MX$)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-16"
+                              id="downshift-5-item-16"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                RUB (₽)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-17"
+                              id="downshift-5-item-17"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                USD ($)
+                              </div>
+                            </li>
+                          </ul>
                         </div>
                         <div
                           class="sc-AxgMl sc-Axmtr hWILTO w-10 pointer-events-none text-theme-neutral"
                         >
                           <div
-                            class="sc-AxhCb jfKWih"
+                            class="sc-AxhCb jfKWih transform rotate-180"
                             height="5"
                             width="7"
                           >
@@ -1622,7 +2390,7 @@ exports[`CreateProfile should store profile with password 1`] = `
                           class="relative w-24 h-24 rounded bg-theme-neutral-contrast"
                         >
                           <div
-                            class="sc-fzoXWK JKhnC"
+                            class="sc-fzoNJl fmQYQu"
                           >
                             <img
                               alt="Profile avatar"
@@ -1730,33 +2498,289 @@ exports[`CreateProfile should store profile with password 1`] = `
                         value="BTC"
                       />
                       <div
-                        class="relative w-full cursor-pointer"
+                        class="relative w-full"
                       >
-                        <div>
-                          <button
-                            aria-expanded="false"
-                            aria-haspopup="listbox"
-                            aria-labelledby="downshift-32-label downshift-32-toggle-button"
-                            class="sc-fzoyTs buZKoP  is-selected "
-                            data-testid="select-list__toggle-button"
-                            id="downshift-32-toggle-button"
-                            type="button"
+                        <div
+                          aria-expanded="true"
+                          aria-haspopup="listbox"
+                          aria-owns="downshift-67-menu"
+                          role="combobox"
+                        >
+                          <label
+                            for="downshift-66-input"
+                            id="downshift-67-label"
+                          />
+                          <div
+                            class="sc-AxmLO kuiknc"
+                            data-testid="SelectDropdownInput"
                           >
-                            BTC (Ƀ)
-                          </button>
+                            <span
+                              class="sc-AxgMl mMYyr py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+                              data-testid="SelectDropdownInput__typeahead"
+                            >
+                              BTC (Ƀ)
+                            </span>
+                            <input
+                              aria-activedescendant="downshift-67-item-0"
+                              aria-autocomplete="list"
+                              aria-controls="downshift-67-menu"
+                              aria-labelledby="downshift-67-label"
+                              autocomplete="off"
+                              class="sc-AxhUy jqmzti overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                              data-testid="SelectDropdownInput__input"
+                              id="downshift-66-input"
+                              name="currency"
+                              placeholder="Select Currency"
+                              value="BTC (Ƀ)"
+                            />
+                          </div>
                           <ul
-                            aria-labelledby="downshift-32-label"
-                            class="sc-fzoNJl gPmoPk"
-                            id="downshift-32-menu"
+                            aria-labelledby="downshift-67-label"
+                            class="sc-fzoyTs bGjmHs is-open"
+                            id="downshift-67-menu"
                             role="listbox"
-                            tabindex="-1"
-                          />
+                          >
+                            <li
+                              aria-selected="true"
+                              class="select-list-option is-highlighted"
+                              data-testid="select-list__toggle-option-0"
+                              id="downshift-67-item-0"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                BTC (Ƀ)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-1"
+                              id="downshift-67-item-1"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                ETH (Ξ)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-2"
+                              id="downshift-67-item-2"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                LTC (Ł)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-3"
+                              id="downshift-67-item-3"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                AUD (A$)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-4"
+                              id="downshift-67-item-4"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                BRL (R$)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-5"
+                              id="downshift-67-item-5"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                CAD (C$)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-6"
+                              id="downshift-67-item-6"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                CHF (CHF)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-7"
+                              id="downshift-67-item-7"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                CNY (¥)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-8"
+                              id="downshift-67-item-8"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                EUR (€)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-9"
+                              id="downshift-67-item-9"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                GBP (£)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-10"
+                              id="downshift-67-item-10"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                HKD (HK$)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-11"
+                              id="downshift-67-item-11"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                IDR (IDR)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-12"
+                              id="downshift-67-item-12"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                INR (₹)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-13"
+                              id="downshift-67-item-13"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                JPY (¥)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-14"
+                              id="downshift-67-item-14"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                KRW (₩)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-15"
+                              id="downshift-67-item-15"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                MXN (MX$)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-16"
+                              id="downshift-67-item-16"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                RUB (₽)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-17"
+                              id="downshift-67-item-17"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                USD ($)
+                              </div>
+                            </li>
+                          </ul>
                         </div>
                         <div
                           class="sc-AxgMl sc-Axmtr hWILTO w-10 pointer-events-none text-theme-neutral"
                         >
                           <div
-                            class="sc-AxhCb jfKWih"
+                            class="sc-AxhCb jfKWih transform rotate-180"
                             height="5"
                             width="7"
                           >
@@ -1990,7 +3014,7 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
                           class="relative w-24 h-24 rounded bg-theme-neutral-contrast"
                         >
                           <div
-                            class="sc-fzoXWK JKhnC"
+                            class="sc-fzoNJl fmQYQu"
                           >
                             <img
                               alt="Profile avatar"
@@ -2098,33 +3122,289 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
                         value="BTC"
                       />
                       <div
-                        class="relative w-full cursor-pointer"
+                        class="relative w-full"
                       >
-                        <div>
-                          <button
-                            aria-expanded="false"
-                            aria-haspopup="listbox"
-                            aria-labelledby="downshift-41-label downshift-41-toggle-button"
-                            class="sc-fzoyTs buZKoP  is-selected "
-                            data-testid="select-list__toggle-button"
-                            id="downshift-41-toggle-button"
-                            type="button"
+                        <div
+                          aria-expanded="true"
+                          aria-haspopup="listbox"
+                          aria-owns="downshift-87-menu"
+                          role="combobox"
+                        >
+                          <label
+                            for="downshift-86-input"
+                            id="downshift-87-label"
+                          />
+                          <div
+                            class="sc-AxmLO kuiknc"
+                            data-testid="SelectDropdownInput"
                           >
-                            BTC (Ƀ)
-                          </button>
+                            <span
+                              class="sc-AxgMl mMYyr py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+                              data-testid="SelectDropdownInput__typeahead"
+                            >
+                              BTC (Ƀ)
+                            </span>
+                            <input
+                              aria-activedescendant="downshift-87-item-0"
+                              aria-autocomplete="list"
+                              aria-controls="downshift-87-menu"
+                              aria-labelledby="downshift-87-label"
+                              autocomplete="off"
+                              class="sc-AxhUy jqmzti overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                              data-testid="SelectDropdownInput__input"
+                              id="downshift-86-input"
+                              name="currency"
+                              placeholder="Select Currency"
+                              value="BTC (Ƀ)"
+                            />
+                          </div>
                           <ul
-                            aria-labelledby="downshift-41-label"
-                            class="sc-fzoNJl gPmoPk"
-                            id="downshift-41-menu"
+                            aria-labelledby="downshift-87-label"
+                            class="sc-fzoyTs bGjmHs is-open"
+                            id="downshift-87-menu"
                             role="listbox"
-                            tabindex="-1"
-                          />
+                          >
+                            <li
+                              aria-selected="true"
+                              class="select-list-option is-highlighted"
+                              data-testid="select-list__toggle-option-0"
+                              id="downshift-87-item-0"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                BTC (Ƀ)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-1"
+                              id="downshift-87-item-1"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                ETH (Ξ)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-2"
+                              id="downshift-87-item-2"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                LTC (Ł)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-3"
+                              id="downshift-87-item-3"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                AUD (A$)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-4"
+                              id="downshift-87-item-4"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                BRL (R$)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-5"
+                              id="downshift-87-item-5"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                CAD (C$)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-6"
+                              id="downshift-87-item-6"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                CHF (CHF)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-7"
+                              id="downshift-87-item-7"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                CNY (¥)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-8"
+                              id="downshift-87-item-8"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                EUR (€)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-9"
+                              id="downshift-87-item-9"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                GBP (£)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-10"
+                              id="downshift-87-item-10"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                HKD (HK$)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-11"
+                              id="downshift-87-item-11"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                IDR (IDR)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-12"
+                              id="downshift-87-item-12"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                INR (₹)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-13"
+                              id="downshift-87-item-13"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                JPY (¥)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-14"
+                              id="downshift-87-item-14"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                KRW (₩)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-15"
+                              id="downshift-87-item-15"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                MXN (MX$)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-16"
+                              id="downshift-87-item-16"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                RUB (₽)
+                              </div>
+                            </li>
+                            <li
+                              aria-selected="false"
+                              class="select-list-option "
+                              data-testid="select-list__toggle-option-17"
+                              id="downshift-87-item-17"
+                              role="option"
+                            >
+                              <div
+                                class="select-list-option__label"
+                              >
+                                USD ($)
+                              </div>
+                            </li>
+                          </ul>
                         </div>
                         <div
                           class="sc-AxgMl sc-Axmtr hWILTO w-10 pointer-events-none text-theme-neutral"
                         >
                           <div
-                            class="sc-AxhCb jfKWih"
+                            class="sc-AxhCb jfKWih transform rotate-180"
                             height="5"
                             width="7"
                           >
diff --git a/src/domains/setting/pages/Settings/Settings.test.tsx b/src/domains/setting/pages/Settings/Settings.test.tsx
index 44ac9eb60d..f5e9772dcf 100755
--- a/src/domains/setting/pages/Settings/Settings.test.tsx
+++ b/src/domains/setting/pages/Settings/Settings.test.tsx
@@ -92,24 +92,6 @@ describe("Settings", () => {
 		expect(showOpenDialogMock).toHaveBeenCalledWith(showOpenDialogParams);
 
 		fireEvent.input(getByTestId("General-settings__input--name"), { target: { value: "test profile" } });
-		// Select Language
-		fireEvent.click(getAllByTestId("select-list__toggle-button")[0]);
-		fireEvent.click(getByTestId("select-list__toggle-option-0"));
-		// Select Passphrase Language
-		fireEvent.click(getAllByTestId("select-list__toggle-button")[1]);
-		fireEvent.click(getByTestId("select-list__toggle-option-0"));
-		// Select Market Provider
-		fireEvent.click(getAllByTestId("select-list__toggle-button")[2]);
-		fireEvent.click(getByTestId("select-list__toggle-option-0"));
-		// Select Currency
-		fireEvent.click(getAllByTestId("select-list__toggle-button")[3]);
-		fireEvent.click(getByTestId("select-list__toggle-option-0"));
-		// Select Time Format
-		fireEvent.click(getAllByTestId("select-list__toggle-button")[4]);
-		fireEvent.click(getByTestId("select-list__toggle-option-0"));
-		// Select Automatic Sign Out Period
-		fireEvent.click(getAllByTestId("select-list__toggle-button")[5]);
-		fireEvent.click(getByTestId("select-list__toggle-option-0"));
 		// Toggle Screenshot Protection
 		fireEvent.click(getByTestId("General-settings__toggle--isScreenshotProtection"));
 		// Toggle Advanced Mode
@@ -169,7 +151,7 @@ describe("Settings", () => {
 	});
 
 	it("should not update profile if profile name exists", async () => {
-		const { asFragment, getAllByTestId, getByTestId } = renderWithRouter(
+		const { asFragment, getByTestId } = renderWithRouter(
 			<Route path="/profiles/:profileId/settings">
 				<Settings />
 			</Route>,
@@ -191,67 +173,6 @@ describe("Settings", () => {
 		});
 
 		fireEvent.input(getByTestId("General-settings__input--name"), { target: { value: "Jane Doe" } });
-		// Select Language
-		fireEvent.click(getAllByTestId("select-list__toggle-button")[0]);
-		fireEvent.click(getByTestId("select-list__toggle-option-0"));
-		// Select Passphrase Language
-		fireEvent.click(getAllByTestId("select-list__toggle-button")[1]);
-		fireEvent.click(getByTestId("select-list__toggle-option-0"));
-		// Select Market Provider
-		fireEvent.click(getAllByTestId("select-list__toggle-button")[2]);
-		fireEvent.click(getByTestId("select-list__toggle-option-0"));
-		// Select Currency
-		fireEvent.click(getAllByTestId("select-list__toggle-button")[3]);
-		fireEvent.click(getByTestId("select-list__toggle-option-0"));
-		// Select Time Format
-		fireEvent.click(getAllByTestId("select-list__toggle-button")[4]);
-		fireEvent.click(getByTestId("select-list__toggle-option-0"));
-		// Toggle Screenshot Protection
-		fireEvent.click(getByTestId("General-settings__toggle--isScreenshotProtection"));
-		// Toggle Advanced Mode
-		fireEvent.click(getByTestId("General-settings__toggle--isAdvancedMode"));
-		// Toggle Update Ledger in Background
-		fireEvent.click(getByTestId("General-settings__toggle--isUpdateLedger"));
-
-		await act(async () => {
-			fireEvent.click(getByTestId("General-settings__submit-button"));
-		});
-
-		expect(asFragment()).toMatchSnapshot();
-	});
-
-	it("should submit using default props", async () => {
-		const { asFragment, getAllByTestId, getByTestId } = renderWithRouter(
-			<Route path="/profiles/:profileId/settings">
-				<Settings />
-			</Route>,
-			{
-				routes: [`/profiles/${profile.id()}/settings`],
-			},
-		);
-
-		fireEvent.input(getByTestId("General-settings__input--name"), { target: { value: "test profile" } });
-		// Select Language
-		fireEvent.click(getAllByTestId("select-list__toggle-button")[0]);
-		fireEvent.click(getByTestId("select-list__toggle-option-0"));
-		// Select Passphrase Language
-		fireEvent.click(getAllByTestId("select-list__toggle-button")[1]);
-		fireEvent.click(getByTestId("select-list__toggle-option-0"));
-		// Select Market Provider
-		fireEvent.click(getAllByTestId("select-list__toggle-button")[2]);
-		fireEvent.click(getByTestId("select-list__toggle-option-0"));
-		// Select Currency
-		fireEvent.click(getAllByTestId("select-list__toggle-button")[3]);
-		fireEvent.click(getByTestId("select-list__toggle-option-0"));
-		// Select Time Format
-		fireEvent.click(getAllByTestId("select-list__toggle-button")[4]);
-		fireEvent.click(getByTestId("select-list__toggle-option-0"));
-		// Toggle Screenshot Protection
-		fireEvent.click(getByTestId("General-settings__toggle--isScreenshotProtection"));
-		// Toggle Advanced Mode
-		fireEvent.click(getByTestId("General-settings__toggle--isAdvancedMode"));
-		// Toggle Update Ledger in Background
-		fireEvent.click(getByTestId("General-settings__toggle--isUpdateLedger"));
 
 		await act(async () => {
 			fireEvent.click(getByTestId("General-settings__submit-button"));
diff --git a/src/domains/setting/pages/Settings/__snapshots__/Settings.test.tsx.snap b/src/domains/setting/pages/Settings/__snapshots__/Settings.test.tsx.snap
index 52cabec37e..b8673aa12d 100644
--- a/src/domains/setting/pages/Settings/__snapshots__/Settings.test.tsx.snap
+++ b/src/domains/setting/pages/Settings/__snapshots__/Settings.test.tsx.snap
@@ -1046,7 +1046,7 @@ exports[`Settings should not update profile if profile name exists 1`] = `
                           class="relative w-24 h-24 rounded bg-theme-neutral-contrast"
                         >
                           <div
-                            class="sc-fznxKY clIQbl"
+                            class="sc-fzpmMD dqyPMh"
                           >
                             <img
                               alt="Profile avatar"
@@ -1137,29 +1137,49 @@ exports[`Settings should not update profile if profile name exists 1`] = `
                               name="passphraseLanguage"
                               readonly=""
                               type="text"
-                              value="chinese_simplified"
+                              value="english"
                             />
                             <div
-                              class="relative w-full cursor-pointer"
+                              class="relative w-full"
                             >
-                              <div>
-                                <button
-                                  aria-expanded="false"
-                                  aria-haspopup="listbox"
-                                  aria-labelledby="downshift-141-label downshift-141-toggle-button"
-                                  class="sc-fzoXWK dAGxql  is-selected "
-                                  data-testid="select-list__toggle-button"
-                                  id="downshift-141-toggle-button"
-                                  type="button"
+                              <div
+                                aria-expanded="false"
+                                aria-haspopup="listbox"
+                                aria-owns="downshift-333-menu"
+                                role="combobox"
+                              >
+                                <label
+                                  for="downshift-332-input"
+                                  id="downshift-333-label"
+                                />
+                                <div
+                                  class="sc-fzpjYC dHxzen"
+                                  data-testid="SelectDropdownInput"
                                 >
-                                  Chinese Simplified
-                                </button>
+                                  <span
+                                    class="sc-fzoyAV gCfUUB py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+                                    data-testid="SelectDropdownInput__typeahead"
+                                  >
+                                    English
+                                  </span>
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-controls="downshift-333-menu"
+                                    aria-labelledby="downshift-333-label"
+                                    autocomplete="off"
+                                    class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                                    data-testid="SelectDropdownInput__input"
+                                    id="downshift-332-input"
+                                    name="passphraseLanguage"
+                                    placeholder="Select Passphrase Language"
+                                    value="English"
+                                  />
+                                </div>
                                 <ul
-                                  aria-labelledby="downshift-141-label"
-                                  class="sc-fzpmMD dhwOMv"
-                                  id="downshift-141-menu"
+                                  aria-labelledby="downshift-333-label"
+                                  class="sc-fzoXWK edrIhW"
+                                  id="downshift-333-menu"
                                   role="listbox"
-                                  tabindex="-1"
                                 />
                               </div>
                               <div
@@ -1204,26 +1224,46 @@ exports[`Settings should not update profile if profile name exists 1`] = `
                               value="BTC"
                             />
                             <div
-                              class="relative w-full cursor-pointer"
+                              class="relative w-full"
                             >
-                              <div>
-                                <button
-                                  aria-expanded="false"
-                                  aria-haspopup="listbox"
-                                  aria-labelledby="downshift-142-label downshift-142-toggle-button"
-                                  class="sc-fzoXWK dAGxql  is-selected "
-                                  data-testid="select-list__toggle-button"
-                                  id="downshift-142-toggle-button"
-                                  type="button"
+                              <div
+                                aria-expanded="false"
+                                aria-haspopup="listbox"
+                                aria-owns="downshift-335-menu"
+                                role="combobox"
+                              >
+                                <label
+                                  for="downshift-334-input"
+                                  id="downshift-335-label"
+                                />
+                                <div
+                                  class="sc-fzpjYC dHxzen"
+                                  data-testid="SelectDropdownInput"
                                 >
-                                  BTC (Ƀ)
-                                </button>
+                                  <span
+                                    class="sc-fzoyAV gCfUUB py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+                                    data-testid="SelectDropdownInput__typeahead"
+                                  >
+                                    BTC (Ƀ)
+                                  </span>
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-controls="downshift-335-menu"
+                                    aria-labelledby="downshift-335-label"
+                                    autocomplete="off"
+                                    class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                                    data-testid="SelectDropdownInput__input"
+                                    id="downshift-334-input"
+                                    name="currency"
+                                    placeholder="Select Currency"
+                                    value="BTC (Ƀ)"
+                                  />
+                                </div>
                                 <ul
-                                  aria-labelledby="downshift-142-label"
-                                  class="sc-fzpmMD dhwOMv"
-                                  id="downshift-142-menu"
+                                  aria-labelledby="downshift-335-label"
+                                  class="sc-fzoXWK edrIhW"
+                                  id="downshift-335-menu"
                                   role="listbox"
-                                  tabindex="-1"
                                 />
                               </div>
                               <div
@@ -1272,26 +1312,46 @@ exports[`Settings should not update profile if profile name exists 1`] = `
                               value="en-US"
                             />
                             <div
-                              class="relative w-full cursor-pointer"
+                              class="relative w-full"
                             >
-                              <div>
-                                <button
-                                  aria-expanded="false"
-                                  aria-haspopup="listbox"
-                                  aria-labelledby="downshift-143-label downshift-143-toggle-button"
-                                  class="sc-fzoXWK dAGxql  is-selected "
-                                  data-testid="select-list__toggle-button"
-                                  id="downshift-143-toggle-button"
-                                  type="button"
+                              <div
+                                aria-expanded="false"
+                                aria-haspopup="listbox"
+                                aria-owns="downshift-337-menu"
+                                role="combobox"
+                              >
+                                <label
+                                  for="downshift-336-input"
+                                  id="downshift-337-label"
+                                />
+                                <div
+                                  class="sc-fzpjYC dHxzen"
+                                  data-testid="SelectDropdownInput"
                                 >
-                                  English
-                                </button>
+                                  <span
+                                    class="sc-fzoyAV gCfUUB py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+                                    data-testid="SelectDropdownInput__typeahead"
+                                  >
+                                    English
+                                  </span>
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-controls="downshift-337-menu"
+                                    aria-labelledby="downshift-337-label"
+                                    autocomplete="off"
+                                    class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                                    data-testid="SelectDropdownInput__input"
+                                    id="downshift-336-input"
+                                    name="language"
+                                    placeholder="Select Language"
+                                    value="English"
+                                  />
+                                </div>
                                 <ul
-                                  aria-labelledby="downshift-143-label"
-                                  class="sc-fzpmMD dhwOMv"
-                                  id="downshift-143-menu"
+                                  aria-labelledby="downshift-337-label"
+                                  class="sc-fzoXWK edrIhW"
+                                  id="downshift-337-menu"
                                   role="listbox"
-                                  tabindex="-1"
                                 />
                               </div>
                               <div
@@ -1333,29 +1393,49 @@ exports[`Settings should not update profile if profile name exists 1`] = `
                               name="marketProvider"
                               readonly=""
                               type="text"
-                              value="coincap"
+                              value="cryptocompare"
                             />
                             <div
-                              class="relative w-full cursor-pointer"
+                              class="relative w-full"
                             >
-                              <div>
-                                <button
-                                  aria-expanded="false"
-                                  aria-haspopup="listbox"
-                                  aria-labelledby="downshift-144-label downshift-144-toggle-button"
-                                  class="sc-fzoXWK dAGxql  is-selected "
-                                  data-testid="select-list__toggle-button"
-                                  id="downshift-144-toggle-button"
-                                  type="button"
+                              <div
+                                aria-expanded="false"
+                                aria-haspopup="listbox"
+                                aria-owns="downshift-339-menu"
+                                role="combobox"
+                              >
+                                <label
+                                  for="downshift-338-input"
+                                  id="downshift-339-label"
+                                />
+                                <div
+                                  class="sc-fzpjYC dHxzen"
+                                  data-testid="SelectDropdownInput"
                                 >
-                                  CoinCap
-                                </button>
+                                  <span
+                                    class="sc-fzoyAV gCfUUB py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+                                    data-testid="SelectDropdownInput__typeahead"
+                                  >
+                                    CryptoCompare
+                                  </span>
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-controls="downshift-339-menu"
+                                    aria-labelledby="downshift-339-label"
+                                    autocomplete="off"
+                                    class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                                    data-testid="SelectDropdownInput__input"
+                                    id="downshift-338-input"
+                                    name="marketProvider"
+                                    placeholder="Select Market Provider"
+                                    value="CryptoCompare"
+                                  />
+                                </div>
                                 <ul
-                                  aria-labelledby="downshift-144-label"
-                                  class="sc-fzpmMD dhwOMv"
-                                  id="downshift-144-menu"
+                                  aria-labelledby="downshift-339-label"
+                                  class="sc-fzoXWK edrIhW"
+                                  id="downshift-339-menu"
                                   role="listbox"
-                                  tabindex="-1"
                                 />
                               </div>
                               <div
@@ -1400,26 +1480,46 @@ exports[`Settings should not update profile if profile name exists 1`] = `
                               value="h:mm A"
                             />
                             <div
-                              class="relative w-full cursor-pointer"
+                              class="relative w-full"
                             >
-                              <div>
-                                <button
-                                  aria-expanded="false"
-                                  aria-haspopup="listbox"
-                                  aria-labelledby="downshift-145-label downshift-145-toggle-button"
-                                  class="sc-fzoXWK dAGxql  is-selected "
-                                  data-testid="select-list__toggle-button"
-                                  id="downshift-145-toggle-button"
-                                  type="button"
+                              <div
+                                aria-expanded="false"
+                                aria-haspopup="listbox"
+                                aria-owns="downshift-341-menu"
+                                role="combobox"
+                              >
+                                <label
+                                  for="downshift-340-input"
+                                  id="downshift-341-label"
+                                />
+                                <div
+                                  class="sc-fzpjYC dHxzen"
+                                  data-testid="SelectDropdownInput"
                                 >
-                                  12h
-                                </button>
+                                  <span
+                                    class="sc-fzoyAV gCfUUB py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+                                    data-testid="SelectDropdownInput__typeahead"
+                                  >
+                                    12h
+                                  </span>
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-controls="downshift-341-menu"
+                                    aria-labelledby="downshift-341-label"
+                                    autocomplete="off"
+                                    class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                                    data-testid="SelectDropdownInput__input"
+                                    id="downshift-340-input"
+                                    name="timeFormat"
+                                    placeholder="Select Time Format"
+                                    value="12h"
+                                  />
+                                </div>
                                 <ul
-                                  aria-labelledby="downshift-145-label"
-                                  class="sc-fzpmMD dhwOMv"
-                                  id="downshift-145-menu"
+                                  aria-labelledby="downshift-341-label"
+                                  class="sc-fzoXWK edrIhW"
+                                  id="downshift-341-menu"
                                   role="listbox"
-                                  tabindex="-1"
                                 />
                               </div>
                               <div
@@ -1600,26 +1700,46 @@ exports[`Settings should not update profile if profile name exists 1`] = `
                                 value="1"
                               />
                               <div
-                                class="relative w-full cursor-pointer"
+                                class="relative w-full"
                               >
-                                <div>
-                                  <button
-                                    aria-expanded="false"
-                                    aria-haspopup="listbox"
-                                    aria-labelledby="downshift-146-label downshift-146-toggle-button"
-                                    class="sc-fzoXWK dAGxql  is-selected "
-                                    data-testid="select-list__toggle-button"
-                                    id="downshift-146-toggle-button"
-                                    type="button"
+                                <div
+                                  aria-expanded="false"
+                                  aria-haspopup="listbox"
+                                  aria-owns="downshift-343-menu"
+                                  role="combobox"
+                                >
+                                  <label
+                                    for="downshift-342-input"
+                                    id="downshift-343-label"
+                                  />
+                                  <div
+                                    class="sc-fzpjYC dHxzen"
+                                    data-testid="SelectDropdownInput"
                                   >
-                                    1 minute
-                                  </button>
+                                    <span
+                                      class="sc-fzoyAV gCfUUB py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+                                      data-testid="SelectDropdownInput__typeahead"
+                                    >
+                                      1 minute
+                                    </span>
+                                    <input
+                                      aria-autocomplete="list"
+                                      aria-controls="downshift-343-menu"
+                                      aria-labelledby="downshift-343-label"
+                                      autocomplete="off"
+                                      class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                                      data-testid="SelectDropdownInput__input"
+                                      id="downshift-342-input"
+                                      name="automaticSignOutPeriod"
+                                      placeholder="Select Automatic Sign Out Period"
+                                      value="1 minute"
+                                    />
+                                  </div>
                                   <ul
-                                    aria-labelledby="downshift-146-label"
-                                    class="sc-fzpmMD dhwOMv"
-                                    id="downshift-146-menu"
+                                    aria-labelledby="downshift-343-label"
+                                    class="sc-fzoXWK edrIhW"
+                                    id="downshift-343-menu"
                                     role="listbox"
-                                    tabindex="-1"
                                   />
                                 </div>
                                 <div
@@ -1796,77 +1916,6 @@ exports[`Settings should not update profile if profile name exists 1`] = `
                     </div>
                   </div>
                 </form>
-                <div
-                  class="fixed inset-0 z-50 flex items-center justify-center w-full h-full overflow-y-scroll"
-                >
-                  <div
-                    class="fixed z-50 w-full h-full bg-black opacity-50"
-                    data-testid="modal__overlay"
-                  />
-                  <div
-                    class="sc-fzpans bNvEoB absolute left-0 right-0 z-50 flex flex-col p-10 mx-auto mb-24 overflow-hidden rounded-xl bg-theme-background "
-                    data-testid="modal__inner"
-                  >
-                    <div
-                      class="absolute top-0 right-0 z-50 mt-5 mr-5 rounded bg-theme-primary-100 hover:text-white hover:bg-theme-neutral-900"
-                    >
-                      <button
-                        class="sc-AxhCb gcoSL w-11 h-11"
-                        color="primary"
-                        data-testid="modal__close-btn"
-                        type="button"
-                      >
-                        <div
-                          class="sc-AxirZ fFqjhX"
-                          height="14"
-                          width="14"
-                        >
-                          <svg>
-                            cross-slim.svg
-                          </svg>
-                        </div>
-                      </button>
-                    </div>
-                    <div
-                      class="relative"
-                    >
-                      <h2
-                        class="mb-0 text-3xl font-bold"
-                      >
-                        Advanced Mode Disclaimer
-                      </h2>
-                      <div
-                        class="flex-1"
-                      >
-                        <div
-                          class="mt-1 text-theme-neutral-dark"
-                        >
-                          By enabling Advanced Mode you hereby assume the risk associated with downloading files and installing said files from a direct URL link. The aforementioned links have neither been tested nor approved by ARK.io and ARK SCIC. We make no warranties, expressed or implied, as to the sustainability, availability, security, of these URLs. We are not responsible for any consequences which may occur from downloading, viewing, or installing files directly from a URL or feature that is activated via toggling on Advanced Mode. ARK.io and ARK SCIC shall bear no liability for any loss suffered by users who bypass certain measures by toggling on Advanced Mode. By clicking “I Accept” you acknowledge that enabling Advanced Mode may result in you downloading, viewing, or installing content that may have bugs, glitches, lack of functionality, or can cause damage to your machine or result in the loss of data.
-                        </div>
-                        <div
-                          class="flex justify-end mt-8 space-x-3"
-                        >
-                          <button
-                            class="sc-AxhCb hvkszb"
-                            color="primary"
-                            data-testid="AdvancedMode__decline-button"
-                            type="button"
-                          >
-                            I Decline
-                          </button>
-                          <button
-                            class="sc-AxhCb khNOPs"
-                            color="primary"
-                            data-testid="AdvancedMode__accept-button"
-                            type="button"
-                          >
-                            I Accept
-                          </button>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
               </div>
             </div>
           </div>
@@ -2460,17 +2509,17 @@ exports[`Settings should open & close modals in the plugin settings 1`] = `
                                 value=""
                               />
                               <div
-                                class="relative w-full cursor-pointer"
+                                class="relative w-full"
                               >
                                 <div
                                   aria-expanded="false"
                                   aria-haspopup="listbox"
-                                  aria-owns="downshift-751-menu"
+                                  aria-owns="downshift-985-menu"
                                   role="combobox"
                                 >
                                   <label
-                                    for="downshift-750-input"
-                                    id="downshift-751-label"
+                                    for="downshift-984-input"
+                                    id="downshift-985-label"
                                   />
                                   <div
                                     class="sc-fzpjYC dHxzen"
@@ -2478,21 +2527,21 @@ exports[`Settings should open & close modals in the plugin settings 1`] = `
                                   >
                                     <input
                                       aria-autocomplete="list"
-                                      aria-controls="downshift-751-menu"
-                                      aria-labelledby="downshift-751-label"
+                                      aria-controls="downshift-985-menu"
+                                      aria-labelledby="downshift-985-label"
                                       autocomplete="off"
                                       class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
                                       data-testid="SelectDropdownInput__input"
-                                      id="downshift-750-input"
+                                      id="downshift-984-input"
                                       name="load-plugins"
                                       placeholder="Select Plugin Source"
                                       value=""
                                     />
                                   </div>
                                   <ul
-                                    aria-labelledby="downshift-751-label"
+                                    aria-labelledby="downshift-985-label"
                                     class="sc-fzoXWK edrIhW"
-                                    id="downshift-751-menu"
+                                    id="downshift-985-menu"
                                     role="listbox"
                                   />
                                 </div>
@@ -3086,7 +3135,7 @@ exports[`Settings should render 1`] = `
                               value="english"
                             />
                             <div
-                              class="relative w-full cursor-pointer"
+                              class="relative w-full"
                             >
                               <div
                                 aria-expanded="false"
@@ -3170,7 +3219,7 @@ exports[`Settings should render 1`] = `
                               value="BTC"
                             />
                             <div
-                              class="relative w-full cursor-pointer"
+                              class="relative w-full"
                             >
                               <div
                                 aria-expanded="false"
@@ -3258,7 +3307,7 @@ exports[`Settings should render 1`] = `
                               value="en-US"
                             />
                             <div
-                              class="relative w-full cursor-pointer"
+                              class="relative w-full"
                             >
                               <div
                                 aria-expanded="false"
@@ -3342,7 +3391,7 @@ exports[`Settings should render 1`] = `
                               value="cryptocompare"
                             />
                             <div
-                              class="relative w-full cursor-pointer"
+                              class="relative w-full"
                             >
                               <div
                                 aria-expanded="false"
@@ -3426,7 +3475,7 @@ exports[`Settings should render 1`] = `
                               value="h:mm A"
                             />
                             <div
-                              class="relative w-full cursor-pointer"
+                              class="relative w-full"
                             >
                               <div
                                 aria-expanded="false"
@@ -3645,7 +3694,7 @@ exports[`Settings should render 1`] = `
                                 value="1"
                               />
                               <div
-                                class="relative w-full cursor-pointer"
+                                class="relative w-full"
                               >
                                 <div
                                   aria-expanded="false"
@@ -5890,17 +5939,17 @@ exports[`Settings should render plugin settings 1`] = `
                                 value=""
                               />
                               <div
-                                class="relative w-full cursor-pointer"
+                                class="relative w-full"
                               >
                                 <div
                                   aria-expanded="false"
                                   aria-haspopup="listbox"
-                                  aria-owns="downshift-641-menu"
+                                  aria-owns="downshift-875-menu"
                                   role="combobox"
                                 >
                                   <label
-                                    for="downshift-640-input"
-                                    id="downshift-641-label"
+                                    for="downshift-874-input"
+                                    id="downshift-875-label"
                                   />
                                   <div
                                     class="sc-fzpjYC dHxzen"
@@ -5908,21 +5957,21 @@ exports[`Settings should render plugin settings 1`] = `
                                   >
                                     <input
                                       aria-autocomplete="list"
-                                      aria-controls="downshift-641-menu"
-                                      aria-labelledby="downshift-641-label"
+                                      aria-controls="downshift-875-menu"
+                                      aria-labelledby="downshift-875-label"
                                       autocomplete="off"
                                       class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
                                       data-testid="SelectDropdownInput__input"
-                                      id="downshift-640-input"
+                                      id="downshift-874-input"
                                       name="load-plugins"
                                       placeholder="Select Plugin Source"
                                       value=""
                                     />
                                   </div>
                                   <ul
-                                    aria-labelledby="downshift-641-label"
+                                    aria-labelledby="downshift-875-label"
                                     class="sc-fzoXWK edrIhW"
-                                    id="downshift-641-menu"
+                                    id="downshift-875-menu"
                                     role="listbox"
                                   />
                                 </div>
@@ -7154,7 +7203,7 @@ exports[`Settings should show an error toast if the current password does not ma
 </DocumentFragment>
 `;
 
-exports[`Settings should submit using default props 1`] = `
+exports[`Settings should update profile 1`] = `
 <DocumentFragment>
   <div
     class="relative flex flex-col min-h-screen bg-theme-neutral-contrast"
@@ -7372,7 +7421,7 @@ exports[`Settings should submit using default props 1`] = `
                   >
                     <img
                       alt="Profile Avatar"
-                      src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(139, 195, 74)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"45\\" cx=\\"100\\" cy=\\"50\\" fill=\\"rgb(33, 150, 243)\\"/><circle r=\\"40\\" cx=\\"10\\" cy=\\"70\\" fill=\\"rgb(3, 169, 244)\\"/><circle r=\\"60\\" cx=\\"50\\" cy=\\"60\\" fill=\\"rgb(0, 150, 136)\\"/></svg>"
+                      src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(103, 58, 183)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"40\\" cx=\\"90\\" cy=\\"50\\" fill=\\"rgb(244, 67, 54)\\"/><circle r=\\"35\\" cx=\\"0\\" cy=\\"30\\" fill=\\"rgb(233, 30, 99)\\"/><circle r=\\"50\\" cx=\\"80\\" cy=\\"60\\" fill=\\"rgb(0, 188, 212)\\"/></svg>"
                     />
                     <span
                       class="absolute text-sm font-semibold text-theme-background"
@@ -7609,12 +7658,12 @@ exports[`Settings should submit using default props 1`] = `
                           class="relative w-24 h-24 rounded bg-theme-neutral-contrast"
                         >
                           <div
-                            class="sc-fznxKY clIQbl"
+                            class="sc-fzpmMD dqyPMh"
                           >
                             <img
                               alt="Profile avatar"
                               class="object-cover w-24 h-24 bg-center bg-no-repeat bg-cover rounded"
-                              src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(139, 195, 74)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"45\\" cx=\\"100\\" cy=\\"50\\" fill=\\"rgb(33, 150, 243)\\"/><circle r=\\"40\\" cx=\\"10\\" cy=\\"70\\" fill=\\"rgb(3, 169, 244)\\"/><circle r=\\"60\\" cx=\\"50\\" cy=\\"60\\" fill=\\"rgb(0, 150, 136)\\"/></svg>"
+                              src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(103, 58, 183)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"40\\" cx=\\"90\\" cy=\\"50\\" fill=\\"rgb(244, 67, 54)\\"/><circle r=\\"35\\" cx=\\"0\\" cy=\\"30\\" fill=\\"rgb(233, 30, 99)\\"/><circle r=\\"50\\" cx=\\"80\\" cy=\\"60\\" fill=\\"rgb(0, 188, 212)\\"/></svg>"
                             />
                             <span
                               class="absolute text-2xl font-semibold text-theme-background"
@@ -7668,7 +7717,7 @@ exports[`Settings should submit using default props 1`] = `
                             data-testid="General-settings__input--name"
                             name="name"
                             type="text"
-                            value="test profile"
+                            value="test profile 2"
                           />
                         </fieldset>
                         <fieldset
@@ -7694,1307 +7743,49 @@ exports[`Settings should submit using default props 1`] = `
                               name="passphraseLanguage"
                               readonly=""
                               type="text"
-                              value="chinese_simplified"
+                              value="english"
                             />
                             <div
-                              class="relative w-full cursor-pointer"
+                              class="relative w-full"
                             >
-                              <div>
-                                <button
-                                  aria-expanded="false"
-                                  aria-haspopup="listbox"
-                                  aria-labelledby="downshift-247-label downshift-247-toggle-button"
-                                  class="sc-fzoXWK dAGxql  is-selected "
-                                  data-testid="select-list__toggle-button"
-                                  id="downshift-247-toggle-button"
-                                  type="button"
-                                >
-                                  Chinese Simplified
-                                </button>
-                                <ul
-                                  aria-labelledby="downshift-247-label"
-                                  class="sc-fzpmMD dhwOMv"
-                                  id="downshift-247-menu"
-                                  role="listbox"
-                                  tabindex="-1"
-                                />
-                              </div>
                               <div
-                                class="sc-fzoyAV sc-fzoXzr YtqIf w-10 pointer-events-none text-theme-neutral"
+                                aria-expanded="false"
+                                aria-haspopup="listbox"
+                                aria-owns="downshift-39-menu"
+                                role="combobox"
                               >
+                                <label
+                                  for="downshift-38-input"
+                                  id="downshift-39-label"
+                                />
                                 <div
-                                  class="sc-AxirZ eRmuSF"
-                                  height="5"
-                                  width="7"
+                                  class="sc-fzpjYC dHxzen"
+                                  data-testid="SelectDropdownInput"
                                 >
-                                  <svg>
-                                    caret-down.svg
-                                  </svg>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </fieldset>
-                        <fieldset
-                          class="sc-fznZeY dWCRDT mt-8"
-                        >
-                          <label
-                            class="flex inline-block mb-2 text-sm font-semibold transition-colors duration-100 FormLabel text-theme-neutral-dark"
-                            data-testid="FormLabel"
-                            for="currency"
-                          >
-                            Currency
-                            <div
-                              class="w-1 h-1 mt-1 ml-1 rounded-full bg-theme-danger-400"
-                              data-testid="FormLabel__required"
-                            />
-                          </label>
-                          <div
-                            class="relative w-full"
-                          >
-                            <input
-                              class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 sr-only"
-                              data-testid="select-list__input"
-                              name="currency"
-                              readonly=""
-                              type="text"
-                              value="BTC"
-                            />
-                            <div
-                              class="relative w-full cursor-pointer"
-                            >
-                              <div>
-                                <button
-                                  aria-expanded="false"
-                                  aria-haspopup="listbox"
-                                  aria-labelledby="downshift-248-label downshift-248-toggle-button"
-                                  class="sc-fzoXWK dAGxql  is-selected "
-                                  data-testid="select-list__toggle-button"
-                                  id="downshift-248-toggle-button"
-                                  type="button"
-                                >
-                                  BTC (Ƀ)
-                                </button>
-                                <ul
-                                  aria-labelledby="downshift-248-label"
-                                  class="sc-fzpmMD dhwOMv"
-                                  id="downshift-248-menu"
-                                  role="listbox"
-                                  tabindex="-1"
-                                />
-                              </div>
-                              <div
-                                class="sc-fzoyAV sc-fzoXzr YtqIf w-10 pointer-events-none text-theme-neutral"
-                              >
-                                <div
-                                  class="sc-AxirZ eRmuSF"
-                                  height="5"
-                                  width="7"
-                                >
-                                  <svg>
-                                    caret-down.svg
-                                  </svg>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </fieldset>
-                      </div>
-                      <div
-                        class="flex flex-col w-2/4 ml-5"
-                      >
-                        <fieldset
-                          class="sc-fznZeY dWCRDT flex flex-col space-y-2"
-                        >
-                          <label
-                            class="flex inline-block mb-2 text-sm font-semibold transition-colors duration-100 FormLabel text-theme-neutral-dark"
-                            data-testid="FormLabel"
-                            for="language"
-                          >
-                            Language
-                            <div
-                              class="w-1 h-1 mt-1 ml-1 rounded-full bg-theme-danger-400"
-                              data-testid="FormLabel__required"
-                            />
-                          </label>
-                          <div
-                            class="relative w-full"
-                          >
-                            <input
-                              class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 sr-only"
-                              data-testid="select-list__input"
-                              name="language"
-                              readonly=""
-                              type="text"
-                              value="en-US"
-                            />
-                            <div
-                              class="relative w-full cursor-pointer"
-                            >
-                              <div>
-                                <button
-                                  aria-expanded="false"
-                                  aria-haspopup="listbox"
-                                  aria-labelledby="downshift-249-label downshift-249-toggle-button"
-                                  class="sc-fzoXWK dAGxql  is-selected "
-                                  data-testid="select-list__toggle-button"
-                                  id="downshift-249-toggle-button"
-                                  type="button"
-                                >
-                                  English
-                                </button>
-                                <ul
-                                  aria-labelledby="downshift-249-label"
-                                  class="sc-fzpmMD dhwOMv"
-                                  id="downshift-249-menu"
-                                  role="listbox"
-                                  tabindex="-1"
-                                />
-                              </div>
-                              <div
-                                class="sc-fzoyAV sc-fzoXzr YtqIf w-10 pointer-events-none text-theme-neutral"
-                              >
-                                <div
-                                  class="sc-AxirZ eRmuSF"
-                                  height="5"
-                                  width="7"
-                                >
-                                  <svg>
-                                    caret-down.svg
-                                  </svg>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </fieldset>
-                        <fieldset
-                          class="sc-fznZeY dWCRDT mt-8"
-                        >
-                          <label
-                            class="flex inline-block mb-2 text-sm font-semibold transition-colors duration-100 FormLabel text-theme-neutral-dark"
-                            data-testid="FormLabel"
-                            for="marketProvider"
-                          >
-                            Market Provider
-                            <div
-                              class="w-1 h-1 mt-1 ml-1 rounded-full bg-theme-danger-400"
-                              data-testid="FormLabel__required"
-                            />
-                          </label>
-                          <div
-                            class="relative w-full"
-                          >
-                            <input
-                              class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 sr-only"
-                              data-testid="select-list__input"
-                              name="marketProvider"
-                              readonly=""
-                              type="text"
-                              value="coincap"
-                            />
-                            <div
-                              class="relative w-full cursor-pointer"
-                            >
-                              <div>
-                                <button
-                                  aria-expanded="false"
-                                  aria-haspopup="listbox"
-                                  aria-labelledby="downshift-250-label downshift-250-toggle-button"
-                                  class="sc-fzoXWK dAGxql  is-selected "
-                                  data-testid="select-list__toggle-button"
-                                  id="downshift-250-toggle-button"
-                                  type="button"
-                                >
-                                  CoinCap
-                                </button>
-                                <ul
-                                  aria-labelledby="downshift-250-label"
-                                  class="sc-fzpmMD dhwOMv"
-                                  id="downshift-250-menu"
-                                  role="listbox"
-                                  tabindex="-1"
-                                />
-                              </div>
-                              <div
-                                class="sc-fzoyAV sc-fzoXzr YtqIf w-10 pointer-events-none text-theme-neutral"
-                              >
-                                <div
-                                  class="sc-AxirZ eRmuSF"
-                                  height="5"
-                                  width="7"
-                                >
-                                  <svg>
-                                    caret-down.svg
-                                  </svg>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </fieldset>
-                        <fieldset
-                          class="sc-fznZeY dWCRDT mt-8"
-                        >
-                          <label
-                            class="flex inline-block mb-2 text-sm font-semibold transition-colors duration-100 FormLabel text-theme-neutral-dark"
-                            data-testid="FormLabel"
-                            for="timeFormat"
-                          >
-                            Time Format
-                            <div
-                              class="w-1 h-1 mt-1 ml-1 rounded-full bg-theme-danger-400"
-                              data-testid="FormLabel__required"
-                            />
-                          </label>
-                          <div
-                            class="relative w-full"
-                          >
-                            <input
-                              class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 sr-only"
-                              data-testid="select-list__input"
-                              name="timeFormat"
-                              readonly=""
-                              type="text"
-                              value="h:mm A"
-                            />
-                            <div
-                              class="relative w-full cursor-pointer"
-                            >
-                              <div>
-                                <button
-                                  aria-expanded="false"
-                                  aria-haspopup="listbox"
-                                  aria-labelledby="downshift-251-label downshift-251-toggle-button"
-                                  class="sc-fzoXWK dAGxql  is-selected "
-                                  data-testid="select-list__toggle-button"
-                                  id="downshift-251-toggle-button"
-                                  type="button"
-                                >
-                                  12h
-                                </button>
-                                <ul
-                                  aria-labelledby="downshift-251-label"
-                                  class="sc-fzpmMD dhwOMv"
-                                  id="downshift-251-menu"
-                                  role="listbox"
-                                  tabindex="-1"
-                                />
-                              </div>
-                              <div
-                                class="sc-fzoyAV sc-fzoXzr YtqIf w-10 pointer-events-none text-theme-neutral"
-                              >
-                                <div
-                                  class="sc-AxirZ eRmuSF"
-                                  height="5"
-                                  width="7"
-                                >
-                                  <svg>
-                                    caret-down.svg
-                                  </svg>
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </fieldset>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="relative mt-10"
-                  >
-                    <h2>
-                      Security
-                    </h2>
-                    <ul
-                      class="sc-fzoNJl iCzYot"
-                      data-testid="list-divided__items"
-                    >
-                      <li
-                        class="flex flex-col w-full pb-6"
-                        data-testid="list-divided-item__wrapper"
-                      >
-                        <div
-                          class="flex justify-between items-center"
-                          data-testid="list-divided-item__inner-wrapper"
-                        >
-                          <div
-                            class="flex flex-col w-full space-y-2"
-                          >
-                            <div
-                              class="flex items-center justify-between space-x-5"
-                            >
-                              <span
-                                class="text-lg font-semibold text-theme-neutral-dark"
-                                data-testid="list-divided-item__label"
-                              >
-                                Screenshot Protection
-                              </span>
-                              <span>
-                                <label
-                                  class="flex"
-                                >
-                                  <input
-                                    class="Toggle__Input-qyyifx-0 bXkHfF"
-                                    data-testid="General-settings__toggle--isScreenshotProtection"
-                                    name="isScreenshotProtection"
-                                    type="checkbox"
-                                  />
-                                  <div
-                                    class="Toggle__Handle-qyyifx-1 jXkMFJ"
-                                  >
-                                    <span
-                                      class="Toggle__HandleInner-qyyifx-2 chnbkf"
-                                    />
-                                  </div>
-                                </label>
-                              </span>
-                            </div>
-                            <span
-                              class="text-sm font-medium text-theme-neutral"
-                              data-testid="list-divided-item__label--description"
-                            >
-                              This protection will protect your money from unwanted Screenshot you PC.
-                            </span>
-                          </div>
-                        </div>
-                      </li>
-                      <li
-                        class="flex flex-col w-full py-6"
-                        data-testid="list-divided-item__wrapper"
-                      >
-                        <div
-                          class="flex justify-between items-center"
-                          data-testid="list-divided-item__inner-wrapper"
-                        >
-                          <div
-                            class="flex flex-col w-full space-y-2"
-                          >
-                            <div
-                              class="flex items-center justify-between space-x-5"
-                            >
-                              <span
-                                class="text-lg font-semibold text-theme-neutral-dark"
-                                data-testid="list-divided-item__label"
-                              >
-                                Advanced Mode
-                              </span>
-                              <span>
-                                <label
-                                  class="flex"
-                                >
-                                  <input
-                                    class="Toggle__Input-qyyifx-0 bXkHfF"
-                                    data-testid="General-settings__toggle--isAdvancedMode"
-                                    name="isAdvancedMode"
-                                    type="checkbox"
-                                  />
-                                  <div
-                                    class="Toggle__Handle-qyyifx-1 jXkMFJ"
-                                  >
-                                    <span
-                                      class="Toggle__HandleInner-qyyifx-2 chnbkf"
-                                    />
-                                  </div>
-                                </label>
-                              </span>
-                            </div>
-                            <span
-                              class="text-sm font-medium text-theme-neutral"
-                              data-testid="list-divided-item__label--description"
-                            >
-                              You hereby assume the risk associated with downloading files and installing said files from a direct URL link.
-                            </span>
-                          </div>
-                        </div>
-                      </li>
-                      <li
-                        class="flex flex-col w-full pt-8"
-                        data-testid="list-divided-item__wrapper"
-                      >
-                        <div
-                          class="flex justify-between items-center"
-                          data-testid="list-divided-item__inner-wrapper"
-                        >
-                          <div
-                            class="flex flex-col w-full space-y-2"
-                          >
-                            <div
-                              class="flex items-center justify-between space-x-5"
-                            >
-                              <span
-                                data-testid="list-divided-item__label"
-                              />
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class=""
-                          data-testid="list-divided-item__content"
-                        >
-                          <fieldset
-                            class="sc-fznZeY dWCRDT flex flex-col space-y-2"
-                          >
-                            <label
-                              class="flex inline-block mb-2 text-sm font-semibold transition-colors duration-100 FormLabel text-theme-neutral-dark"
-                              data-testid="FormLabel"
-                              for="automaticSignOutPeriod"
-                            >
-                              Automatic Sign Out Period
-                              <div
-                                class="w-1 h-1 mt-1 ml-1 rounded-full bg-theme-danger-400"
-                                data-testid="FormLabel__required"
-                              />
-                            </label>
-                            <div
-                              class="relative w-full"
-                            >
-                              <input
-                                class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 sr-only"
-                                data-testid="select-list__input"
-                                name="automaticSignOutPeriod"
-                                readonly=""
-                                type="text"
-                                value="1"
-                              />
-                              <div
-                                class="relative w-full cursor-pointer"
-                              >
-                                <div>
-                                  <button
-                                    aria-expanded="false"
-                                    aria-haspopup="listbox"
-                                    aria-labelledby="downshift-252-label downshift-252-toggle-button"
-                                    class="sc-fzoXWK dAGxql  is-selected "
-                                    data-testid="select-list__toggle-button"
-                                    id="downshift-252-toggle-button"
-                                    type="button"
-                                  >
-                                    1 minute
-                                  </button>
-                                  <ul
-                                    aria-labelledby="downshift-252-label"
-                                    class="sc-fzpmMD dhwOMv"
-                                    id="downshift-252-menu"
-                                    role="listbox"
-                                    tabindex="-1"
-                                  />
-                                </div>
-                                <div
-                                  class="sc-fzoyAV sc-fzoXzr YtqIf w-10 pointer-events-none text-theme-neutral"
-                                >
-                                  <div
-                                    class="sc-AxirZ eRmuSF"
-                                    height="5"
-                                    width="7"
-                                  >
-                                    <svg>
-                                      caret-down.svg
-                                    </svg>
-                                  </div>
-                                </div>
-                              </div>
-                            </div>
-                          </fieldset>
-                        </div>
-                      </li>
-                    </ul>
-                  </div>
-                  <div
-                    class="relative mt-10"
-                  >
-                    <h2>
-                      Other
-                    </h2>
-                    <ul
-                      class="sc-fzoNJl iCzYot"
-                      data-testid="list-divided__items"
-                    >
-                      <li
-                        class="flex flex-col w-full pb-6"
-                        data-testid="list-divided-item__wrapper"
-                      >
-                        <div
-                          class="flex justify-between items-center"
-                          data-testid="list-divided-item__inner-wrapper"
-                        >
-                          <div
-                            class="flex flex-col w-full space-y-2"
-                          >
-                            <div
-                              class="flex items-center justify-between space-x-5"
-                            >
-                              <span
-                                class="text-lg font-semibold text-theme-neutral-dark"
-                                data-testid="list-divided-item__label"
-                              >
-                                Dark Theme
-                              </span>
-                              <span>
-                                <label
-                                  class="flex"
-                                >
-                                  <input
-                                    checked=""
-                                    class="Toggle__Input-qyyifx-0 bXkHfF"
-                                    data-testid="General-settings__toggle--isDarkMode"
-                                    name="isDarkMode"
-                                    type="checkbox"
-                                  />
-                                  <div
-                                    class="Toggle__Handle-qyyifx-1 jXkMFJ"
-                                  >
-                                    <span
-                                      class="Toggle__HandleInner-qyyifx-2 chnbkf"
-                                    />
-                                  </div>
-                                </label>
-                              </span>
-                            </div>
-                            <span
-                              class="text-sm font-medium text-theme-neutral"
-                              data-testid="list-divided-item__label--description"
-                            >
-                              Enables a dark, high contrast color scheme.
-                            </span>
-                          </div>
-                        </div>
-                      </li>
-                      <li
-                        class="flex flex-col w-full pt-6"
-                        data-testid="list-divided-item__wrapper"
-                      >
-                        <div
-                          class="flex justify-between items-center"
-                          data-testid="list-divided-item__inner-wrapper"
-                        >
-                          <div
-                            class="flex flex-col w-full space-y-2"
-                          >
-                            <div
-                              class="flex items-center justify-between space-x-5"
-                            >
-                              <span
-                                class="text-lg font-semibold text-theme-neutral-dark"
-                                data-testid="list-divided-item__label"
-                              >
-                                Update Ledger in Background
-                              </span>
-                              <span>
-                                <label
-                                  class="flex"
-                                >
-                                  <input
-                                    class="Toggle__Input-qyyifx-0 bXkHfF"
-                                    data-testid="General-settings__toggle--isUpdateLedger"
-                                    name="isUpdateLedger"
-                                    type="checkbox"
-                                  />
-                                  <div
-                                    class="Toggle__Handle-qyyifx-1 jXkMFJ"
-                                  >
-                                    <span
-                                      class="Toggle__HandleInner-qyyifx-2 chnbkf"
-                                    />
-                                  </div>
-                                </label>
-                              </span>
-                            </div>
-                            <span
-                              class="text-sm font-medium text-theme-neutral"
-                              data-testid="list-divided-item__label--description"
-                            >
-                              You hereby assume the risk associated with downloading files and installing said files from a direct URL link.
-                            </span>
-                          </div>
-                        </div>
-                      </li>
-                    </ul>
-                  </div>
-                  <div
-                    class="flex justify-between w-full pt-2"
-                  >
-                    <button
-                      class="sc-AxhCb cWbcYc"
-                      color="danger"
-                      type="button"
-                    >
-                      <div
-                        class="sc-AxirZ iQaTP"
-                        height="1em"
-                        width="1em"
-                      >
-                        <svg>
-                          reset.svg
-                        </svg>
-                      </div>
-                      <span>
-                        Reset Data
-                      </span>
-                    </button>
-                    <div
-                      class="space-x-3"
-                    >
-                      <button
-                        class="sc-AxhCb hvkszb"
-                        color="primary"
-                        type="button"
-                      >
-                        Cancel
-                      </button>
-                      <button
-                        class="sc-AxhCb khNOPs"
-                        color="primary"
-                        data-testid="General-settings__submit-button"
-                        type="submit"
-                      >
-                        Save
-                      </button>
-                    </div>
-                  </div>
-                </form>
-                <div
-                  class="fixed inset-0 z-50 flex items-center justify-center w-full h-full overflow-y-scroll"
-                >
-                  <div
-                    class="fixed z-50 w-full h-full bg-black opacity-50"
-                    data-testid="modal__overlay"
-                  />
-                  <div
-                    class="sc-fzpans bNvEoB absolute left-0 right-0 z-50 flex flex-col p-10 mx-auto mb-24 overflow-hidden rounded-xl bg-theme-background "
-                    data-testid="modal__inner"
-                  >
-                    <div
-                      class="absolute top-0 right-0 z-50 mt-5 mr-5 rounded bg-theme-primary-100 hover:text-white hover:bg-theme-neutral-900"
-                    >
-                      <button
-                        class="sc-AxhCb gcoSL w-11 h-11"
-                        color="primary"
-                        data-testid="modal__close-btn"
-                        type="button"
-                      >
-                        <div
-                          class="sc-AxirZ fFqjhX"
-                          height="14"
-                          width="14"
-                        >
-                          <svg>
-                            cross-slim.svg
-                          </svg>
-                        </div>
-                      </button>
-                    </div>
-                    <div
-                      class="relative"
-                    >
-                      <h2
-                        class="mb-0 text-3xl font-bold"
-                      >
-                        Advanced Mode Disclaimer
-                      </h2>
-                      <div
-                        class="flex-1"
-                      >
-                        <div
-                          class="mt-1 text-theme-neutral-dark"
-                        >
-                          By enabling Advanced Mode you hereby assume the risk associated with downloading files and installing said files from a direct URL link. The aforementioned links have neither been tested nor approved by ARK.io and ARK SCIC. We make no warranties, expressed or implied, as to the sustainability, availability, security, of these URLs. We are not responsible for any consequences which may occur from downloading, viewing, or installing files directly from a URL or feature that is activated via toggling on Advanced Mode. ARK.io and ARK SCIC shall bear no liability for any loss suffered by users who bypass certain measures by toggling on Advanced Mode. By clicking “I Accept” you acknowledge that enabling Advanced Mode may result in you downloading, viewing, or installing content that may have bugs, glitches, lack of functionality, or can cause damage to your machine or result in the loss of data.
-                        </div>
-                        <div
-                          class="flex justify-end mt-8 space-x-3"
-                        >
-                          <button
-                            class="sc-AxhCb hvkszb"
-                            color="primary"
-                            data-testid="AdvancedMode__decline-button"
-                            type="button"
-                          >
-                            I Decline
-                          </button>
-                          <button
-                            class="sc-AxhCb khNOPs"
-                            color="primary"
-                            data-testid="AdvancedMode__accept-button"
-                            type="button"
-                          >
-                            I Accept
-                          </button>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`Settings should update profile 1`] = `
-<DocumentFragment>
-  <div
-    class="relative flex flex-col min-h-screen bg-theme-neutral-contrast"
-  >
-    <nav
-      aria-labelledby="main menu"
-      class="sc-fzoiQi bBgYbl"
-    >
-      <div
-        class="px-4 sm:px-6 lg:px-10"
-      >
-        <div
-          class="relative flex justify-between h-20 md:h-24"
-        >
-          <div
-            class="flex items-center my-auto"
-          >
-            <div
-              class="sc-fzqARJ ktgHVM"
-            >
-              <svg
-                width="48"
-              >
-                ark-logo.svg
-              </svg>
-            </div>
-          </div>
-          <ul
-            class="flex h-20 mr-auto md:h-24"
-          >
-            <li
-              class="flex"
-            >
-              <a
-                class="flex items-center mx-4 font-semibold transition-colors duration-200 text-md text-theme-neutral-dark hover:text-theme-neutral-900"
-                href="/profiles/b999d134-7a24-481e-a95d-bc47c543bfc9/dashboard"
-                title="Portfolio"
-              >
-                Portfolio
-              </a>
-            </li>
-            <li
-              class="flex"
-            >
-              <a
-                class="flex items-center mx-4 font-semibold transition-colors duration-200 text-md text-theme-neutral-dark hover:text-theme-neutral-900"
-                href="/profiles/b999d134-7a24-481e-a95d-bc47c543bfc9/plugins"
-                title="Plugins"
-              >
-                Plugins
-              </a>
-            </li>
-            <li
-              class="flex"
-            >
-              <a
-                class="flex items-center mx-4 font-semibold transition-colors duration-200 text-md text-theme-neutral-dark hover:text-theme-neutral-900"
-                href="/profiles/b999d134-7a24-481e-a95d-bc47c543bfc9/exchange"
-                title="Exchange"
-              >
-                Exchange
-              </a>
-            </li>
-            <li
-              class="flex"
-            >
-              <a
-                class="flex items-center mx-4 font-semibold transition-colors duration-200 text-md text-theme-neutral-dark hover:text-theme-neutral-900"
-                href="/profiles/b999d134-7a24-481e-a95d-bc47c543bfc9/news"
-                title="News"
-              >
-                News
-              </a>
-            </li>
-          </ul>
-          <div
-            class="flex items-center my-auto space-x-4"
-          >
-            <div>
-              <div
-                class="relative"
-                data-testid="dropdown__toggle"
-              >
-                <div
-                  class="overflow-hidden rounded-lg"
-                >
-                  <button
-                    class="sc-AxhCb gcoSL text-theme-primary-300 hover:text-theme-primary-700 hover:bg-theme-primary-50"
-                    color="primary"
-                    data-testid="navbar__buttons--notifications"
-                    type="button"
-                  >
-                    <div
-                      class="sc-AxirZ hmuEJr p-1"
-                      height="22"
-                      width="22"
-                    >
-                      <svg>
-                        notification.svg
-                      </svg>
-                    </div>
-                    <div
-                      class="absolute right-0 flex items-center justify-center w-3 h-3 mr-3 -mt-3 bg-white border-white rounded-full"
-                    >
-                      <div
-                        class="w-2 h-2 rounded-full bg-theme-danger-500"
-                      />
-                    </div>
-                  </button>
-                </div>
-              </div>
-            </div>
-            <div
-              class="h-8 border-r border-theme-neutral-200"
-            />
-            <div
-              class="flex items-center overflow-hidden rounded-lg"
-            >
-              <button
-                class="sc-AxhCb gcoSL text-theme-primary-300 hover:text-theme-primary-dark hover:bg-theme-primary-50"
-                color="primary"
-                data-testid="navbar__buttons--send"
-                type="button"
-              >
-                <div
-                  class="sc-AxirZ hmuEJr p-1"
-                  height="22"
-                  width="22"
-                >
-                  <svg>
-                    sent.svg
-                  </svg>
-                </div>
-              </button>
-            </div>
-            <div
-              class="h-8 border-r border-theme-neutral-200"
-            />
-            <div
-              class="flex items-center overflow-hidden rounded-lg"
-            >
-              <button
-                class="sc-AxhCb gcoSL text-theme-primary-300 hover:text-theme-primary-dark hover:bg-theme-primary-50"
-                color="primary"
-                data-testid="navbar__buttons--receive"
-                type="button"
-              >
-                <div
-                  class="sc-AxirZ hmuEJr p-1"
-                  height="22"
-                  width="22"
-                >
-                  <svg>
-                    receive.svg
-                  </svg>
-                </div>
-              </button>
-            </div>
-            <div
-              class="h-8 border-r border-theme-neutral-200"
-            />
-          </div>
-          <div
-            class="flex items-center my-auto ml-8 mr-4"
-          >
-            <div
-              class="text-right"
-            >
-              <div
-                class="text-xs font-medium text-theme-neutral"
-              >
-                Your balance
-              </div>
-              <div
-                class="text-sm font-bold text-theme-neutral-dark"
-              >
-                <span
-                  data-testid="Amount"
-                >
-                  91.43089801 BTC
-                </span>
-              </div>
-            </div>
-            <div
-              class="relative"
-              data-testid="dropdown__toggle"
-            >
-              <div
-                class="ml-4 cursor-pointer"
-                data-testid="navbar__useractions"
-              >
-                <div
-                  class="sc-AxhUy dHClEW -mr-2 border-theme-primary-contrast"
-                >
-                  <span
-                    class="text-theme-neutral-dark"
-                  >
-                    <div
-                      class="sc-AxirZ iQaTP"
-                      height="1em"
-                      width="1em"
-                    >
-                      <svg>
-                        btc.svg
-                      </svg>
-                    </div>
-                  </span>
-                </div>
-                <div
-                  class="relative inline-flex items-center justify-center align-middle rounded-full"
-                  data-testid="navbar__user--avatar"
-                >
-                  <div
-                    class="Avatar__AvatarWrapper-sc-1vsy2s2-0 eHceTZ"
-                  >
-                    <img
-                      alt="Profile Avatar"
-                      src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(103, 58, 183)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"40\\" cx=\\"90\\" cy=\\"50\\" fill=\\"rgb(244, 67, 54)\\"/><circle r=\\"35\\" cx=\\"0\\" cy=\\"30\\" fill=\\"rgb(233, 30, 99)\\"/><circle r=\\"50\\" cx=\\"80\\" cy=\\"60\\" fill=\\"rgb(0, 188, 212)\\"/></svg>"
-                    />
-                    <span
-                      class="absolute text-sm font-semibold text-theme-background"
-                    >
-                      TE
-                    </span>
-                  </div>
-                  <span
-                    class="sc-AxiKw eGdvNF flex border-2 rounded-full justify-center w-5 h-5 items-center align-middle bg-theme-background border-transparent bg-theme-primary-contrast border-theme-primary-contrast text-theme-primary-500"
-                  >
-                    <div
-                      class="sc-AxirZ fttODj"
-                      height="10"
-                      width="10"
-                    >
-                      <svg>
-                        chevron-down.svg
-                      </svg>
-                    </div>
-                    <span />
-                  </span>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </nav>
-    <div
-      class="flex items-center space-x-3 text-sm container py-5 mx-auto font-semibold px-14 text-theme-neutral-dark"
-      data-testid="breadcrumbs__wrapper"
-    >
-      <div
-        class="sc-AxirZ eKWnGz"
-        height="24"
-        width="13"
-      >
-        <svg>
-          arrow-left.svg
-        </svg>
-      </div>
-      <div
-        class="space-x-3"
-      >
-        <a
-          class="text-theme-neutral-dark"
-          href="/profiles/b999d134-7a24-481e-a95d-bc47c543bfc9/dashboard"
-        >
-          <span>
-            Go back to Portfolio
-          </span>
-        </a>
-      </div>
-    </div>
-    <div
-      class="flex flex-col flex-1 "
-    >
-      <div
-        class="flex flex-1 bg-theme-background"
-      >
-        <div
-          class="container flex mx-auto"
-        >
-          <div
-            class="px-10 my-16 border-r-1 border-theme-primary-contrast"
-          >
-            <div
-              class="sc-fzoyTs hroXia"
-            >
-              <ul>
-                <div
-                  class="relative cursor-pointer"
-                  data-testid="side-menu__item--General"
-                >
-                  <div
-                    class="sc-fzqNqU dmTJfp absolute top-0 left-0 rounded-lg bg-theme-primary"
-                  />
-                  <li
-                    class="rounded-lg py-5 pl-10 pr-8 h-15 text-theme-primary bg-theme-primary-contrast flex items-center"
-                  >
-                    <div
-                      class="text-theme-primary"
-                    >
-                      <div
-                        class="sc-AxirZ eEbZjj"
-                        height="20"
-                        width="20"
-                      >
-                        <svg>
-                          general.svg
-                        </svg>
-                      </div>
-                    </div>
-                    <span
-                      class="ml-3 text-lg font-semibold"
-                    >
-                      General
-                    </span>
-                  </li>
-                </div>
-                <div
-                  class="relative cursor-pointer"
-                  data-testid="side-menu__item--Peer"
-                >
-                  <li
-                    class="rounded-lg py-5 pl-10 pr-8 h-15 text-theme-medium flex items-center"
-                  >
-                    <div
-                      class="text-theme-primary-light"
-                    >
-                      <div
-                        class="sc-AxirZ eEbZjj"
-                        height="20"
-                        width="20"
-                      >
-                        <svg>
-                          peer.svg
-                        </svg>
-                      </div>
-                    </div>
-                    <span
-                      class="ml-3 text-lg font-medium"
-                    >
-                      Peer
-                    </span>
-                  </li>
-                </div>
-                <div
-                  class="relative cursor-pointer"
-                  data-testid="side-menu__item--Plugins"
-                >
-                  <li
-                    class="rounded-lg py-5 pl-10 pr-8 h-15 text-theme-medium flex items-center"
-                  >
-                    <div
-                      class="text-theme-primary-light"
-                    >
-                      <div
-                        class="sc-AxirZ eEbZjj"
-                        height="20"
-                        width="20"
-                      >
-                        <svg>
-                          plugin.svg
-                        </svg>
-                      </div>
-                    </div>
-                    <span
-                      class="ml-3 text-lg font-medium"
-                    >
-                      Plugins
-                    </span>
-                  </li>
-                </div>
-                <div
-                  class="relative cursor-pointer"
-                  data-testid="side-menu__item--Password"
-                >
-                  <li
-                    class="rounded-lg py-5 pl-10 pr-8 h-15 text-theme-medium flex items-center"
-                  >
-                    <div
-                      class="text-theme-primary-light"
-                    >
-                      <div
-                        class="sc-AxirZ eEbZjj"
-                        height="20"
-                        width="20"
-                      >
-                        <svg>
-                          lock.svg
-                        </svg>
-                      </div>
-                    </div>
-                    <span
-                      class="ml-3 text-lg font-medium"
-                    >
-                      Password
-                    </span>
-                  </li>
-                </div>
-              </ul>
-            </div>
-          </div>
-          <div
-            class="w-full ml-16"
-          >
-            <div
-              class="Section__SectionWrapper-sc-8cjvre-0 bryymu"
-            >
-              <div
-                class="container py-16 mx-auto px-14"
-              >
-                <div
-                  class="flex items-end justify-between bg-theme-background"
-                >
-                  <div>
-                    <h1
-                      class="mb-0 md:text-4xl"
-                      data-testid="header__title"
-                    >
-                      Profile Settings
-                    </h1>
-                    <div
-                      class="text-theme-neutral-dark"
-                      data-testid="header__subtitle"
-                    >
-                      Customize your wallet to suit your needs.
-                    </div>
-                  </div>
-                </div>
-                <form
-                  class="space-y-8"
-                  data-testid="General-settings__form"
-                >
-                  <div
-                    class="relative mt-8"
-                  >
-                    <h2>
-                      Personal Details
-                    </h2>
-                    <div
-                      class="group undefined"
-                    >
-                      <span
-                        class="text-sm font-semibold transition-colors duration-100 group-hover:text-theme-primary text-theme-neutral-dark"
-                      >
-                        Profile Image
-                      </span>
-                      <div
-                        class="flex flex-row mt-2"
-                      >
-                        <div
-                          class="relative w-24 h-24 rounded bg-theme-neutral-contrast"
-                        >
-                          <div
-                            class="sc-fznxKY clIQbl"
-                          >
-                            <img
-                              alt="Profile avatar"
-                              class="object-cover w-24 h-24 bg-center bg-no-repeat bg-cover rounded"
-                              src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(103, 58, 183)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"40\\" cx=\\"90\\" cy=\\"50\\" fill=\\"rgb(244, 67, 54)\\"/><circle r=\\"35\\" cx=\\"0\\" cy=\\"30\\" fill=\\"rgb(233, 30, 99)\\"/><circle r=\\"50\\" cx=\\"80\\" cy=\\"60\\" fill=\\"rgb(0, 188, 212)\\"/></svg>"
-                            />
-                            <span
-                              class="absolute text-2xl font-semibold text-theme-background"
-                            >
-                              TE
-                            </span>
-                            <div
-                              class="absolute z-50 hidden overflow-hidden rounded-full upload-button-overlay w-22 h-22"
-                              data-testid="SelectProfileImage__upload-button"
-                            >
-                              <div
-                                class="flex items-center justify-center w-22 h-22"
-                              >
-                                <div
-                                  class="sc-AxirZ iQaTP text-white"
-                                  height="1em"
-                                  width="1em"
-                                >
-                                  <svg>
-                                    upload.svg
-                                  </svg>
+                                  <span
+                                    class="sc-fzoyAV gCfUUB py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+                                    data-testid="SelectDropdownInput__typeahead"
+                                  >
+                                    English
+                                  </span>
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-controls="downshift-39-menu"
+                                    aria-labelledby="downshift-39-label"
+                                    autocomplete="off"
+                                    class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                                    data-testid="SelectDropdownInput__input"
+                                    id="downshift-38-input"
+                                    name="passphraseLanguage"
+                                    placeholder="Select Passphrase Language"
+                                    value="English"
+                                  />
                                 </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="flex justify-between w-full mt-8"
-                    >
-                      <div
-                        class="flex flex-col w-2/4"
-                      >
-                        <fieldset
-                          class="sc-fznZeY dWCRDT flex flex-col space-y-2"
-                        >
-                          <label
-                            class="flex inline-block mb-2 text-sm font-semibold transition-colors duration-100 FormLabel text-theme-neutral-dark"
-                            data-testid="FormLabel"
-                            for="name"
-                          >
-                            Name
-                            <div
-                              class="w-1 h-1 mt-1 ml-1 rounded-full bg-theme-danger-400"
-                              data-testid="FormLabel__required"
-                            />
-                          </label>
-                          <input
-                            class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 "
-                            data-testid="General-settings__input--name"
-                            name="name"
-                            type="text"
-                            value="test profile 2"
-                          />
-                        </fieldset>
-                        <fieldset
-                          class="sc-fznZeY dWCRDT mt-8"
-                        >
-                          <label
-                            class="flex inline-block mb-2 text-sm font-semibold transition-colors duration-100 FormLabel text-theme-neutral-dark"
-                            data-testid="FormLabel"
-                            for="passphraseLanguage"
-                          >
-                            Passphrase Language
-                            <div
-                              class="w-1 h-1 mt-1 ml-1 rounded-full bg-theme-danger-400"
-                              data-testid="FormLabel__required"
-                            />
-                          </label>
-                          <div
-                            class="relative w-full"
-                          >
-                            <input
-                              class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 sr-only"
-                              data-testid="select-list__input"
-                              name="passphraseLanguage"
-                              readonly=""
-                              type="text"
-                              value="chinese_simplified"
-                            />
-                            <div
-                              class="relative w-full cursor-pointer"
-                            >
-                              <div>
-                                <button
-                                  aria-expanded="false"
-                                  aria-haspopup="listbox"
-                                  aria-labelledby="downshift-12-label downshift-12-toggle-button"
-                                  class="sc-fzoXWK dAGxql  is-selected "
-                                  data-testid="select-list__toggle-button"
-                                  id="downshift-12-toggle-button"
-                                  type="button"
-                                >
-                                  Chinese Simplified
-                                </button>
                                 <ul
-                                  aria-labelledby="downshift-12-label"
-                                  class="sc-fzpmMD dhwOMv"
-                                  id="downshift-12-menu"
+                                  aria-labelledby="downshift-39-label"
+                                  class="sc-fzoXWK edrIhW"
+                                  id="downshift-39-menu"
                                   role="listbox"
-                                  tabindex="-1"
                                 />
                               </div>
                               <div
@@ -9039,26 +7830,46 @@ exports[`Settings should update profile 1`] = `
                               value="BTC"
                             />
                             <div
-                              class="relative w-full cursor-pointer"
+                              class="relative w-full"
                             >
-                              <div>
-                                <button
-                                  aria-expanded="false"
-                                  aria-haspopup="listbox"
-                                  aria-labelledby="downshift-13-label downshift-13-toggle-button"
-                                  class="sc-fzoXWK dAGxql  is-selected "
-                                  data-testid="select-list__toggle-button"
-                                  id="downshift-13-toggle-button"
-                                  type="button"
+                              <div
+                                aria-expanded="false"
+                                aria-haspopup="listbox"
+                                aria-owns="downshift-41-menu"
+                                role="combobox"
+                              >
+                                <label
+                                  for="downshift-40-input"
+                                  id="downshift-41-label"
+                                />
+                                <div
+                                  class="sc-fzpjYC dHxzen"
+                                  data-testid="SelectDropdownInput"
                                 >
-                                  BTC (Ƀ)
-                                </button>
+                                  <span
+                                    class="sc-fzoyAV gCfUUB py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+                                    data-testid="SelectDropdownInput__typeahead"
+                                  >
+                                    BTC (Ƀ)
+                                  </span>
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-controls="downshift-41-menu"
+                                    aria-labelledby="downshift-41-label"
+                                    autocomplete="off"
+                                    class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                                    data-testid="SelectDropdownInput__input"
+                                    id="downshift-40-input"
+                                    name="currency"
+                                    placeholder="Select Currency"
+                                    value="BTC (Ƀ)"
+                                  />
+                                </div>
                                 <ul
-                                  aria-labelledby="downshift-13-label"
-                                  class="sc-fzpmMD dhwOMv"
-                                  id="downshift-13-menu"
+                                  aria-labelledby="downshift-41-label"
+                                  class="sc-fzoXWK edrIhW"
+                                  id="downshift-41-menu"
                                   role="listbox"
-                                  tabindex="-1"
                                 />
                               </div>
                               <div
@@ -9107,26 +7918,46 @@ exports[`Settings should update profile 1`] = `
                               value="en-US"
                             />
                             <div
-                              class="relative w-full cursor-pointer"
+                              class="relative w-full"
                             >
-                              <div>
-                                <button
-                                  aria-expanded="false"
-                                  aria-haspopup="listbox"
-                                  aria-labelledby="downshift-14-label downshift-14-toggle-button"
-                                  class="sc-fzoXWK dAGxql  is-selected "
-                                  data-testid="select-list__toggle-button"
-                                  id="downshift-14-toggle-button"
-                                  type="button"
+                              <div
+                                aria-expanded="false"
+                                aria-haspopup="listbox"
+                                aria-owns="downshift-43-menu"
+                                role="combobox"
+                              >
+                                <label
+                                  for="downshift-42-input"
+                                  id="downshift-43-label"
+                                />
+                                <div
+                                  class="sc-fzpjYC dHxzen"
+                                  data-testid="SelectDropdownInput"
                                 >
-                                  English
-                                </button>
+                                  <span
+                                    class="sc-fzoyAV gCfUUB py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+                                    data-testid="SelectDropdownInput__typeahead"
+                                  >
+                                    English
+                                  </span>
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-controls="downshift-43-menu"
+                                    aria-labelledby="downshift-43-label"
+                                    autocomplete="off"
+                                    class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                                    data-testid="SelectDropdownInput__input"
+                                    id="downshift-42-input"
+                                    name="language"
+                                    placeholder="Select Language"
+                                    value="English"
+                                  />
+                                </div>
                                 <ul
-                                  aria-labelledby="downshift-14-label"
-                                  class="sc-fzpmMD dhwOMv"
-                                  id="downshift-14-menu"
+                                  aria-labelledby="downshift-43-label"
+                                  class="sc-fzoXWK edrIhW"
+                                  id="downshift-43-menu"
                                   role="listbox"
-                                  tabindex="-1"
                                 />
                               </div>
                               <div
@@ -9168,29 +7999,49 @@ exports[`Settings should update profile 1`] = `
                               name="marketProvider"
                               readonly=""
                               type="text"
-                              value="coincap"
+                              value="cryptocompare"
                             />
                             <div
-                              class="relative w-full cursor-pointer"
+                              class="relative w-full"
                             >
-                              <div>
-                                <button
-                                  aria-expanded="false"
-                                  aria-haspopup="listbox"
-                                  aria-labelledby="downshift-15-label downshift-15-toggle-button"
-                                  class="sc-fzoXWK dAGxql  is-selected "
-                                  data-testid="select-list__toggle-button"
-                                  id="downshift-15-toggle-button"
-                                  type="button"
+                              <div
+                                aria-expanded="false"
+                                aria-haspopup="listbox"
+                                aria-owns="downshift-45-menu"
+                                role="combobox"
+                              >
+                                <label
+                                  for="downshift-44-input"
+                                  id="downshift-45-label"
+                                />
+                                <div
+                                  class="sc-fzpjYC dHxzen"
+                                  data-testid="SelectDropdownInput"
                                 >
-                                  CoinCap
-                                </button>
+                                  <span
+                                    class="sc-fzoyAV gCfUUB py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+                                    data-testid="SelectDropdownInput__typeahead"
+                                  >
+                                    CryptoCompare
+                                  </span>
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-controls="downshift-45-menu"
+                                    aria-labelledby="downshift-45-label"
+                                    autocomplete="off"
+                                    class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                                    data-testid="SelectDropdownInput__input"
+                                    id="downshift-44-input"
+                                    name="marketProvider"
+                                    placeholder="Select Market Provider"
+                                    value="CryptoCompare"
+                                  />
+                                </div>
                                 <ul
-                                  aria-labelledby="downshift-15-label"
-                                  class="sc-fzpmMD dhwOMv"
-                                  id="downshift-15-menu"
+                                  aria-labelledby="downshift-45-label"
+                                  class="sc-fzoXWK edrIhW"
+                                  id="downshift-45-menu"
                                   role="listbox"
-                                  tabindex="-1"
                                 />
                               </div>
                               <div
@@ -9235,26 +8086,46 @@ exports[`Settings should update profile 1`] = `
                               value="h:mm A"
                             />
                             <div
-                              class="relative w-full cursor-pointer"
+                              class="relative w-full"
                             >
-                              <div>
-                                <button
-                                  aria-expanded="false"
-                                  aria-haspopup="listbox"
-                                  aria-labelledby="downshift-16-label downshift-16-toggle-button"
-                                  class="sc-fzoXWK dAGxql  is-selected "
-                                  data-testid="select-list__toggle-button"
-                                  id="downshift-16-toggle-button"
-                                  type="button"
+                              <div
+                                aria-expanded="false"
+                                aria-haspopup="listbox"
+                                aria-owns="downshift-47-menu"
+                                role="combobox"
+                              >
+                                <label
+                                  for="downshift-46-input"
+                                  id="downshift-47-label"
+                                />
+                                <div
+                                  class="sc-fzpjYC dHxzen"
+                                  data-testid="SelectDropdownInput"
                                 >
-                                  12h
-                                </button>
+                                  <span
+                                    class="sc-fzoyAV gCfUUB py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+                                    data-testid="SelectDropdownInput__typeahead"
+                                  >
+                                    12h
+                                  </span>
+                                  <input
+                                    aria-autocomplete="list"
+                                    aria-controls="downshift-47-menu"
+                                    aria-labelledby="downshift-47-label"
+                                    autocomplete="off"
+                                    class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                                    data-testid="SelectDropdownInput__input"
+                                    id="downshift-46-input"
+                                    name="timeFormat"
+                                    placeholder="Select Time Format"
+                                    value="12h"
+                                  />
+                                </div>
                                 <ul
-                                  aria-labelledby="downshift-16-label"
-                                  class="sc-fzpmMD dhwOMv"
-                                  id="downshift-16-menu"
+                                  aria-labelledby="downshift-47-label"
+                                  class="sc-fzoXWK edrIhW"
+                                  id="downshift-47-menu"
                                   role="listbox"
-                                  tabindex="-1"
                                 />
                               </div>
                               <div
@@ -9435,26 +8306,46 @@ exports[`Settings should update profile 1`] = `
                                 value="1"
                               />
                               <div
-                                class="relative w-full cursor-pointer"
+                                class="relative w-full"
                               >
-                                <div>
-                                  <button
-                                    aria-expanded="false"
-                                    aria-haspopup="listbox"
-                                    aria-labelledby="downshift-17-label downshift-17-toggle-button"
-                                    class="sc-fzoXWK dAGxql  is-selected "
-                                    data-testid="select-list__toggle-button"
-                                    id="downshift-17-toggle-button"
-                                    type="button"
+                                <div
+                                  aria-expanded="false"
+                                  aria-haspopup="listbox"
+                                  aria-owns="downshift-49-menu"
+                                  role="combobox"
+                                >
+                                  <label
+                                    for="downshift-48-input"
+                                    id="downshift-49-label"
+                                  />
+                                  <div
+                                    class="sc-fzpjYC dHxzen"
+                                    data-testid="SelectDropdownInput"
                                   >
-                                    1 minute
-                                  </button>
+                                    <span
+                                      class="sc-fzoyAV gCfUUB py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+                                      data-testid="SelectDropdownInput__typeahead"
+                                    >
+                                      1 minute
+                                    </span>
+                                    <input
+                                      aria-autocomplete="list"
+                                      aria-controls="downshift-49-menu"
+                                      aria-labelledby="downshift-49-label"
+                                      autocomplete="off"
+                                      class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                                      data-testid="SelectDropdownInput__input"
+                                      id="downshift-48-input"
+                                      name="automaticSignOutPeriod"
+                                      placeholder="Select Automatic Sign Out Period"
+                                      value="1 minute"
+                                    />
+                                  </div>
                                   <ul
-                                    aria-labelledby="downshift-17-label"
-                                    class="sc-fzpmMD dhwOMv"
-                                    id="downshift-17-menu"
+                                    aria-labelledby="downshift-49-label"
+                                    class="sc-fzoXWK edrIhW"
+                                    id="downshift-49-menu"
                                     role="listbox"
-                                    tabindex="-1"
                                   />
                                 </div>
                                 <div
diff --git a/src/domains/transaction/components/LinkCollection/LinkCollection.test.tsx b/src/domains/transaction/components/LinkCollection/LinkCollection.test.tsx
index ffe6c6283f..5ec7489554 100644
--- a/src/domains/transaction/components/LinkCollection/LinkCollection.test.tsx
+++ b/src/domains/transaction/components/LinkCollection/LinkCollection.test.tsx
@@ -76,16 +76,16 @@ describe("LinkCollection", () => {
 
 		fireEvent.click(getByTestId("LinkCollection__header"));
 
-		const toggle = getByTestId("select-list__toggle-button");
+		const selectDropdown = getByTestId("SelectDropdownInput__input");
 
 		await act(async () => {
-			fireEvent.click(toggle);
+			fireEvent.change(selectDropdown, { target: { value: "Twitter" } });
 		});
 
 		expect(getByTestId("LinkCollection__add-link")).toBeDisabled();
 		expect(getByTestId("LinkCollection__input-link")).toBeDisabled();
 
-		const firstOption = getByTestId("select-list__toggle-option-1");
+		const firstOption = getByTestId("select-list__toggle-option-0");
 		expect(firstOption).toBeTruthy();
 
 		await act(async () => {
@@ -170,10 +170,10 @@ describe("LinkCollection", () => {
 
 		fireEvent.click(getByTestId("LinkCollection__header"));
 
-		const toggle = getByTestId("select-list__toggle-button");
+		const selectDropdown = getByTestId("SelectDropdownInput__input");
 
 		await act(async () => {
-			fireEvent.click(toggle);
+			fireEvent.change(selectDropdown, { target: { value: "Test" } });
 		});
 
 		await act(async () => {
@@ -217,16 +217,18 @@ describe("LinkCollection", () => {
 
 		fireEvent.click(getByTestId("LinkCollection__header"));
 
-		const toggle = getByTestId("select-list__toggle-button");
+		const selectDropdown = getByTestId("SelectDropdownInput__input");
 
 		await act(async () => {
-			fireEvent.click(toggle);
+			fireEvent.change(selectDropdown, { target: { value: "TestEntity 1" } });
 		});
 
 		await act(async () => {
 			fireEvent.click(getByTestId("select-list__toggle-option-0"));
 		});
 
+		expect(getByTestId("select-list__input")).toHaveValue("test-entity-1");
+
 		const input = getByTestId("LinkCollection__input-link");
 		const button = getByTestId("LinkCollection__add-link");
 
@@ -242,13 +244,21 @@ describe("LinkCollection", () => {
 		expect(button).toBeEnabled();
 
 		await act(async () => {
-			fireEvent.click(toggle);
+			fireEvent.change(selectDropdown, { target: { value: "TestEntity 3" } });
 		});
 
+		expect(getByTestId("select-list__input")).toHaveValue("");
+
 		await act(async () => {
-			fireEvent.click(getByTestId("select-list__toggle-option-1"));
+			fireEvent.change(selectDropdown, { target: { value: "TestEntity 2" } });
 		});
 
+		await act(async () => {
+			fireEvent.click(getByTestId("select-list__toggle-option-0"));
+		});
+
+		expect(getByTestId("select-list__input")).toHaveValue("test-entity-2");
+
 		await waitFor(() => expect(input).toBeInvalid());
 		expect(button).toBeDisabled();
 	});
diff --git a/src/domains/transaction/components/LinkCollection/__snapshots__/LinkCollection.test.tsx.snap b/src/domains/transaction/components/LinkCollection/__snapshots__/LinkCollection.test.tsx.snap
index 29a4d4790b..e7071b7da4 100644
--- a/src/domains/transaction/components/LinkCollection/__snapshots__/LinkCollection.test.tsx.snap
+++ b/src/domains/transaction/components/LinkCollection/__snapshots__/LinkCollection.test.tsx.snap
@@ -3,7 +3,7 @@
 exports[`LinkCollection should add links 1`] = `
 <DocumentFragment>
   <div
-    class="sc-fzqBZW eEiUFK flex flex-col font-normal"
+    class="sc-fzokOt lkSsTn flex flex-col font-normal"
     data-testid="LinkCollection"
   >
     <div
@@ -65,33 +65,68 @@ exports[`LinkCollection should add links 1`] = `
               value="twitter"
             />
             <div
-              class="relative w-full cursor-pointer"
+              class="relative w-full"
             >
-              <div>
-                <button
-                  aria-expanded="false"
-                  aria-haspopup="listbox"
-                  aria-labelledby="downshift-1-label downshift-1-toggle-button"
-                  class="sc-fzplWN jAabRP  is-selected "
-                  data-testid="select-list__toggle-button"
-                  id="downshift-1-toggle-button"
-                  type="button"
+              <div
+                aria-expanded="true"
+                aria-haspopup="listbox"
+                aria-owns="downshift-5-menu"
+                role="combobox"
+              >
+                <label
+                  for="downshift-4-input"
+                  id="downshift-5-label"
+                />
+                <div
+                  class="sc-Axmtr jzhOwR"
+                  data-testid="SelectDropdownInput"
                 >
-                  Twitter
-                </button>
+                  <span
+                    class="sc-AxhUy escgqZ py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+                    data-testid="SelectDropdownInput__typeahead"
+                  >
+                    Twitter
+                  </span>
+                  <input
+                    aria-activedescendant="downshift-5-item-0"
+                    aria-autocomplete="list"
+                    aria-controls="downshift-5-menu"
+                    aria-labelledby="downshift-5-label"
+                    autocomplete="off"
+                    class="sc-AxhCb biYFdn overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                    data-testid="SelectDropdownInput__input"
+                    id="downshift-4-input"
+                    name="type"
+                    placeholder="Select option"
+                    value="Twitter"
+                  />
+                </div>
                 <ul
-                  aria-labelledby="downshift-1-label"
-                  class="sc-fznyAO dPDaFu"
-                  id="downshift-1-menu"
+                  aria-labelledby="downshift-5-label"
+                  class="sc-fzplWN cDHryc is-open"
+                  id="downshift-5-menu"
                   role="listbox"
-                  tabindex="-1"
-                />
+                >
+                  <li
+                    aria-selected="true"
+                    class="select-list-option is-highlighted"
+                    data-testid="select-list__toggle-option-0"
+                    id="downshift-5-item-0"
+                    role="option"
+                  >
+                    <div
+                      class="select-list-option__label"
+                    >
+                      Twitter
+                    </div>
+                  </li>
+                </ul>
               </div>
               <div
                 class="sc-AxhUy sc-AxheI bYHtKZ w-10 pointer-events-none text-theme-neutral"
               >
                 <div
-                  class="sc-AxiKw jNSjzx"
+                  class="sc-AxiKw jNSjzx transform rotate-180"
                   height="5"
                   width="7"
                 >
@@ -135,7 +170,7 @@ exports[`LinkCollection should add links 1`] = `
         </button>
       </div>
       <div
-        class="sc-fznKkj iLZSgh mt-4"
+        class="sc-fznyAO eiMfGs mt-4"
         role="table"
       >
         <table
@@ -343,17 +378,17 @@ exports[`LinkCollection should remove links 1`] = `
               value=""
             />
             <div
-              class="relative w-full cursor-pointer"
+              class="relative w-full"
             >
               <div
                 aria-expanded="false"
                 aria-haspopup="listbox"
-                aria-owns="downshift-9-menu"
+                aria-owns="downshift-33-menu"
                 role="combobox"
               >
                 <label
-                  for="downshift-8-input"
-                  id="downshift-9-label"
+                  for="downshift-32-input"
+                  id="downshift-33-label"
                 />
                 <div
                   class="sc-Axmtr jzhOwR"
@@ -361,21 +396,21 @@ exports[`LinkCollection should remove links 1`] = `
                 >
                   <input
                     aria-autocomplete="list"
-                    aria-controls="downshift-9-menu"
-                    aria-labelledby="downshift-9-label"
+                    aria-controls="downshift-33-menu"
+                    aria-labelledby="downshift-33-label"
                     autocomplete="off"
                     class="sc-AxhCb biYFdn overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
                     data-testid="SelectDropdownInput__input"
-                    id="downshift-8-input"
+                    id="downshift-32-input"
                     name="type"
                     placeholder="Select option"
                     value=""
                   />
                 </div>
                 <ul
-                  aria-labelledby="downshift-9-label"
+                  aria-labelledby="downshift-33-label"
                   class="sc-fzplWN cDHryc"
-                  id="downshift-9-menu"
+                  id="downshift-33-menu"
                   role="listbox"
                 />
               </div>
@@ -533,17 +568,17 @@ exports[`LinkCollection should select a specific link type 1`] = `
               value=""
             />
             <div
-              class="relative w-full cursor-pointer"
+              class="relative w-full"
             >
               <div
                 aria-expanded="false"
                 aria-haspopup="listbox"
-                aria-owns="downshift-25-menu"
+                aria-owns="downshift-89-menu"
                 role="combobox"
               >
                 <label
-                  for="downshift-24-input"
-                  id="downshift-25-label"
+                  for="downshift-88-input"
+                  id="downshift-89-label"
                 />
                 <div
                   class="sc-Axmtr jzhOwR"
@@ -551,21 +586,21 @@ exports[`LinkCollection should select a specific link type 1`] = `
                 >
                   <input
                     aria-autocomplete="list"
-                    aria-controls="downshift-25-menu"
-                    aria-labelledby="downshift-25-label"
+                    aria-controls="downshift-89-menu"
+                    aria-labelledby="downshift-89-label"
                     autocomplete="off"
                     class="sc-AxhCb biYFdn overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
                     data-testid="SelectDropdownInput__input"
-                    id="downshift-24-input"
+                    id="downshift-88-input"
                     name="type"
                     placeholder="Select option"
                     value=""
                   />
                 </div>
                 <ul
-                  aria-labelledby="downshift-25-label"
+                  aria-labelledby="downshift-89-label"
                   class="sc-fzplWN cDHryc"
-                  id="downshift-25-menu"
+                  id="downshift-89-menu"
                   role="listbox"
                 />
               </div>
diff --git a/src/domains/transaction/pages/SendEntityRegistration/SendEntityRegistration.test.tsx b/src/domains/transaction/pages/SendEntityRegistration/SendEntityRegistration.test.tsx
index 626831827b..55cd695d4f 100644
--- a/src/domains/transaction/pages/SendEntityRegistration/SendEntityRegistration.test.tsx
+++ b/src/domains/transaction/pages/SendEntityRegistration/SendEntityRegistration.test.tsx
@@ -200,11 +200,11 @@ describe("Registration", () => {
 		const { asFragment, getByTestId } = rendered!;
 
 		await renderHookAct(async () => {
-			fireEvent.click(getByTestId("select-list__toggle-button"));
+			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Delegate" } });
 
-			await waitFor(() => expect(getByTestId("select-list__toggle-option-1")).toBeTruthy());
+			await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
 
-			fireEvent.click(getByTestId("select-list__toggle-option-1"));
+			fireEvent.click(getByTestId("select-list__toggle-option-0"));
 
 			await waitFor(() =>
 				expect(setValueSpy).toHaveBeenNthCalledWith(
@@ -249,11 +249,11 @@ describe("Registration", () => {
 		const { asFragment, getByTestId } = rendered!;
 
 		await renderHookAct(async () => {
-			fireEvent.click(getByTestId("select-list__toggle-button"));
+			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Delegate" } });
 
-			await waitFor(() => expect(getByTestId("select-list__toggle-option-1")).toBeTruthy());
+			await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
 
-			fireEvent.click(getByTestId("select-list__toggle-option-1"));
+			fireEvent.click(getByTestId("select-list__toggle-option-0"));
 
 			await waitFor(() =>
 				expect(setValueSpy).toHaveBeenNthCalledWith(
@@ -276,11 +276,11 @@ describe("Registration", () => {
 		expect(typeSelectInput).not.toHaveValue("delegateRegistration");
 
 		await act(async () => {
-			fireEvent.click(getByTestId("select-list__toggle-button"));
+			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Delegate" } });
 
-			await waitFor(() => expect(getByTestId("select-list__toggle-option-1")).toBeTruthy());
+			await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
 
-			fireEvent.click(getByTestId("select-list__toggle-option-1"));
+			fireEvent.click(getByTestId("select-list__toggle-option-0"));
 
 			await waitFor(() => expect(getByTestId("Registration__continue-button")).not.toHaveAttribute("disabled"));
 
@@ -317,13 +317,12 @@ describe("Registration", () => {
 	});
 
 	it("should not have delegate option if wallet is a delegate", async () => {
-		const { asFragment, getByTestId, queryByText } = await renderPage(secondWallet);
+		const { asFragment, getByTestId } = await renderPage(secondWallet);
 
 		await act(async () => {
-			fireEvent.click(getByTestId("select-list__toggle-button"));
+			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Delegate" } });
 		});
-		await waitFor(() => expect(queryByText("Business")).toBeInTheDocument());
-		await waitFor(() => expect(queryByText("Delegate")).not.toBeInTheDocument());
+		await waitFor(() => expect(getByTestId("select-list__input")).toHaveValue(""));
 		expect(asFragment()).toMatchSnapshot();
 	});
 
@@ -334,11 +333,11 @@ describe("Registration", () => {
 		expect(typeSelectInput).not.toHaveValue("delegateRegistration");
 
 		await act(async () => {
-			fireEvent.click(getByTestId("select-list__toggle-button"));
+			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Delegate" } });
 
-			await waitFor(() => expect(getByTestId("select-list__toggle-option-1")).toBeTruthy());
+			await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
 
-			fireEvent.click(getByTestId("select-list__toggle-option-1"));
+			fireEvent.click(getByTestId("select-list__toggle-option-0"));
 
 			await waitFor(() => expect(getByTestId("Registration__continue-button")).not.toHaveAttribute("disabled"));
 
@@ -377,11 +376,11 @@ describe("Registration", () => {
 		expect(typeSelectInput).not.toHaveValue("delegateRegistration");
 
 		await act(async () => {
-			fireEvent.click(getByTestId("select-list__toggle-button"));
+			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Delegate" } });
 
-			await waitFor(() => expect(getByTestId("select-list__toggle-option-1")).toBeTruthy());
+			await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
 
-			fireEvent.click(getByTestId("select-list__toggle-option-1"));
+			fireEvent.click(getByTestId("select-list__toggle-option-0"));
 
 			await waitFor(() => expect(getByTestId("Registration__continue-button")).not.toHaveAttribute("disabled"));
 
@@ -425,10 +424,10 @@ describe("Registration", () => {
 
 		await act(async () => {
 			// Step 1
-			fireEvent.click(getByTestId("select-list__toggle-button"));
-			await waitFor(() => expect(getByTestId("select-list__toggle-option-1")).toBeTruthy());
+			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Delegate" } });
+			await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
 
-			fireEvent.click(getByTestId("select-list__toggle-option-1"));
+			fireEvent.click(getByTestId("select-list__toggle-option-0"));
 			await waitFor(() => expect(getByTestId("Registration__continue-button")).not.toHaveAttribute("disabled"));
 
 			// Step 2
@@ -521,10 +520,10 @@ describe("Registration", () => {
 
 		await act(async () => {
 			// Step 1
-			fireEvent.click(getByTestId("select-list__toggle-button"));
-			await waitFor(() => expect(getByTestId("select-list__toggle-option-1")).toBeTruthy());
+			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Delegate" } });
+			await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
 
-			fireEvent.click(getByTestId("select-list__toggle-option-1"));
+			fireEvent.click(getByTestId("select-list__toggle-option-0"));
 			await waitFor(() => expect(getByTestId("Registration__continue-button")).not.toHaveAttribute("disabled"));
 
 			// Step 2
@@ -579,7 +578,7 @@ describe("Registration", () => {
 		const { asFragment, getByTestId } = await renderPage(wallet);
 
 		act(() => {
-			fireEvent.click(getByTestId("select-list__toggle-button"));
+			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Business" } });
 		});
 
 		await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
@@ -609,7 +608,7 @@ describe("Registration", () => {
 		const { getByTestId, getAllByTestId } = await renderPage(wallet);
 
 		act(() => {
-			fireEvent.click(getByTestId("select-list__toggle-button"));
+			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Business" } });
 		});
 
 		await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
@@ -638,7 +637,7 @@ describe("Registration", () => {
 		const { asFragment, getByTestId } = await renderPage(wallet);
 
 		act(() => {
-			fireEvent.click(getByTestId("select-list__toggle-button"));
+			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Business" } });
 		});
 
 		await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
@@ -668,7 +667,7 @@ describe("Registration", () => {
 		const { asFragment, getByTestId } = await renderPage(wallet);
 
 		act(() => {
-			fireEvent.click(getByTestId("select-list__toggle-button"));
+			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Business" } });
 		});
 
 		await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
@@ -700,7 +699,7 @@ describe("Registration", () => {
 		const { asFragment, getByTestId } = await renderPage(wallet);
 
 		act(() => {
-			fireEvent.click(getByTestId("select-list__toggle-button"));
+			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Business" } });
 		});
 
 		await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
@@ -730,7 +729,7 @@ describe("Registration", () => {
 		const { asFragment, getByTestId } = await renderPage(wallet);
 
 		act(() => {
-			fireEvent.click(getByTestId("select-list__toggle-button"));
+			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Business" } });
 		});
 
 		await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
@@ -803,7 +802,7 @@ describe("Registration", () => {
 		const { asFragment, getByTestId, getAllByTestId } = await renderPage(wallet);
 
 		act(() => {
-			fireEvent.click(getByTestId("select-list__toggle-button"));
+			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Business" } });
 		});
 
 		await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
@@ -874,18 +873,19 @@ describe("Registration", () => {
 		const addLink = async (collection: any, optionLabel: string, inputValue: string) => {
 			await toggleLinkCollectionHeader(collection);
 
-			const selectButton = within(collection).getByTestId("select-list__toggle-button");
+			const selectDropdown = within(collection).getByTestId("SelectDropdownInput__input");
 
 			await act(async () => {
-				fireEvent.click(selectButton);
+				fireEvent.change(selectDropdown, { target: { value: optionLabel } });
 			});
 
+			const firstOption = getByTestId("select-list__toggle-option-0");
+			await waitFor(() => expect(firstOption).toBeTruthy());
+
 			await act(async () => {
-				fireEvent.click(within(collection).getByText(optionLabel), { selector: ["role=option"] });
+				fireEvent.click(firstOption);
 			});
 
-			await waitFor(() => expect(selectButton).toHaveTextContent(optionLabel));
-
 			const input = within(collection).getByTestId("LinkCollection__input-link");
 
 			await waitFor(() => expect(input).toBeEnabled());
@@ -959,7 +959,7 @@ describe("Registration", () => {
 		await waitFor(() => expect(queryAllByTestId("Registration__type")).toHaveLength(1));
 
 		act(() => {
-			fireEvent.click(getByTestId("select-list__toggle-button"));
+			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Business" } });
 		});
 
 		await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
diff --git a/src/domains/transaction/pages/SendEntityRegistration/__snapshots__/SendEntityRegistration.test.tsx.snap b/src/domains/transaction/pages/SendEntityRegistration/__snapshots__/SendEntityRegistration.test.tsx.snap
index c573ccc739..421b602fd0 100644
--- a/src/domains/transaction/pages/SendEntityRegistration/__snapshots__/SendEntityRegistration.test.tsx.snap
+++ b/src/domains/transaction/pages/SendEntityRegistration/__snapshots__/SendEntityRegistration.test.tsx.snap
@@ -865,7 +865,7 @@ exports[`Registration should fill all data including link collections 1`] = `
                               class="font-semibold"
                             >
                               <div
-                                class="sc-fznWOq leTOwr flex flex-col font-normal"
+                                class="sc-fznMAR ecTYIw flex flex-col font-normal"
                                 data-testid="LinkCollection"
                               >
                                 <div
@@ -909,7 +909,7 @@ exports[`Registration should fill all data including link collections 1`] = `
                               class="font-semibold"
                             >
                               <div
-                                class="sc-fznWOq leTOwr flex flex-col font-normal"
+                                class="sc-fznMAR ecTYIw flex flex-col font-normal"
                                 data-testid="LinkCollection"
                               >
                                 <div
@@ -953,7 +953,7 @@ exports[`Registration should fill all data including link collections 1`] = `
                               class="font-semibold"
                             >
                               <div
-                                class="sc-fznWOq leTOwr flex flex-col font-normal"
+                                class="sc-fznMAR ecTYIw flex flex-col font-normal"
                                 data-testid="LinkCollection"
                               >
                                 <div
@@ -1651,7 +1651,7 @@ exports[`Registration should go to review step after successfully filling form d
                                   class="flex flex-col w-1/2 justify-center px-4 py-2"
                                 >
                                   <span
-                                    class="sc-fzolEj gcosPd"
+                                    class="sc-fznWOq evvoWC"
                                   >
                                     Transaction Amount
                                   </span>
@@ -1666,7 +1666,7 @@ exports[`Registration should go to review step after successfully filling form d
                                   class="flex flex-col w-1/2 justify-center px-4 py-2 text-right"
                                 >
                                   <span
-                                    class="sc-fzolEj gcosPd"
+                                    class="sc-fznWOq evvoWC"
                                   >
                                     Transaction Fee
                                   </span>
@@ -1700,7 +1700,7 @@ exports[`Registration should go to review step after successfully filling form d
                               class="flex flex-col items-center py-6 border-t rounded-b-lg border-theme-neutral-300 justfiy-center bg-theme-neutral-contrast"
                             >
                               <span
-                                class="sc-fzolEj gcosPd"
+                                class="sc-fznWOq evvoWC"
                               >
                                 Total Amount
                               </span>
@@ -2170,7 +2170,7 @@ exports[`Registration should not have delegate option if wallet is a delegate 1`
                       >
                         <div>
                           <button
-                            class="sc-fzqBkg hKoddb SelectAddress  "
+                            class="sc-fzolEj kkRTJY SelectAddress  "
                             data-testid="SelectAddress__wrapper"
                             type="button"
                           >
@@ -2250,50 +2250,46 @@ exports[`Registration should not have delegate option if wallet is a delegate 1`
                           value=""
                         />
                         <div
-                          class="relative w-full cursor-pointer"
+                          class="relative w-full"
                         >
-                          <div>
-                            <button
-                              aria-expanded="true"
-                              aria-haspopup="listbox"
-                              aria-labelledby="downshift-36-label downshift-36-toggle-button"
-                              class="sc-fznxKY ftvzgS is-open  "
-                              data-testid="select-list__toggle-button"
-                              id="downshift-36-toggle-button"
-                              type="button"
+                          <div
+                            aria-expanded="true"
+                            aria-haspopup="listbox"
+                            aria-owns="downshift-79-menu"
+                            role="combobox"
+                          >
+                            <label
+                              for="downshift-78-input"
+                              id="downshift-79-label"
                             />
+                            <div
+                              class="sc-fzpjYC dHxzen"
+                              data-testid="SelectDropdownInput"
+                            >
+                              <input
+                                aria-autocomplete="list"
+                                aria-controls="downshift-79-menu"
+                                aria-labelledby="downshift-79-label"
+                                autocomplete="off"
+                                class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                                data-testid="SelectDropdownInput__input"
+                                id="downshift-78-input"
+                                name="registrationType"
+                                placeholder="Select option"
+                                value="Delegate"
+                              />
+                            </div>
                             <ul
-                              aria-labelledby="downshift-36-label"
-                              class="sc-fznMAR hjPwmz is-open"
-                              id="downshift-36-menu"
+                              aria-labelledby="downshift-79-label"
+                              class="sc-fznxKY erNwxN is-open"
+                              id="downshift-79-menu"
                               role="listbox"
-                              tabindex="-1"
                             >
                               <li
-                                aria-selected="false"
-                                class="select-list-option "
-                                data-testid="select-list__toggle-option-0"
-                                id="downshift-36-item-0"
-                                role="option"
+                                class="select-list-option is-empty"
+                                data-testid="select-list__empty-option"
                               >
-                                <div
-                                  class="select-list-option__label"
-                                >
-                                  Business
-                                </div>
-                              </li>
-                              <li
-                                aria-selected="false"
-                                class="select-list-option "
-                                data-testid="select-list__toggle-option-1"
-                                id="downshift-36-item-1"
-                                role="option"
-                              >
-                                <div
-                                  class="select-list-option__label"
-                                >
-                                  MultiSignature
-                                </div>
+                                No options
                               </li>
                             </ul>
                           </div>
@@ -2434,7 +2430,7 @@ exports[`Registration should not set fee if no fee options 1`] = `
       >
         <div>
           <button
-            class="sc-fzqBkg hKoddb SelectAddress  "
+            class="sc-fzolEj kkRTJY SelectAddress  "
             data-testid="SelectAddress__wrapper"
             type="button"
           >
@@ -2496,33 +2492,68 @@ exports[`Registration should not set fee if no fee options 1`] = `
           value="delegateRegistration"
         />
         <div
-          class="relative w-full cursor-pointer"
+          class="relative w-full"
         >
-          <div>
-            <button
-              aria-expanded="false"
-              aria-haspopup="listbox"
-              aria-labelledby="downshift-15-label downshift-15-toggle-button"
-              class="sc-fznxKY ftvzgS  is-selected "
-              data-testid="select-list__toggle-button"
-              id="downshift-15-toggle-button"
-              type="button"
-            >
-              Delegate
-            </button>
+          <div
+            aria-expanded="true"
+            aria-haspopup="listbox"
+            aria-owns="downshift-33-menu"
+            role="combobox"
+          >
+            <label
+              for="downshift-32-input"
+              id="downshift-33-label"
+            />
+            <div
+              class="sc-fzpjYC dHxzen"
+              data-testid="SelectDropdownInput"
+            >
+              <span
+                class="sc-fzoyAV gCfUUB py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+                data-testid="SelectDropdownInput__typeahead"
+              >
+                Delegate
+              </span>
+              <input
+                aria-activedescendant="downshift-33-item-0"
+                aria-autocomplete="list"
+                aria-controls="downshift-33-menu"
+                aria-labelledby="downshift-33-label"
+                autocomplete="off"
+                class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                data-testid="SelectDropdownInput__input"
+                id="downshift-32-input"
+                name="registrationType"
+                placeholder="Select option"
+                value="Delegate"
+              />
+            </div>
             <ul
-              aria-labelledby="downshift-15-label"
-              class="sc-fznMAR hjPwmz"
-              id="downshift-15-menu"
+              aria-labelledby="downshift-33-label"
+              class="sc-fznxKY erNwxN is-open"
+              id="downshift-33-menu"
               role="listbox"
-              tabindex="-1"
-            />
+            >
+              <li
+                aria-selected="true"
+                class="select-list-option is-highlighted"
+                data-testid="select-list__toggle-option-0"
+                id="downshift-33-item-0"
+                role="option"
+              >
+                <div
+                  class="select-list-option__label"
+                >
+                  Delegate
+                </div>
+              </li>
+            </ul>
           </div>
           <div
             class="sc-fzoyAV sc-fzoXzr YtqIf w-10 pointer-events-none text-theme-neutral"
           >
             <div
-              class="sc-AxiKw jNSjzx"
+              class="sc-AxiKw jNSjzx transform rotate-180"
               height="5"
               width="7"
             >
@@ -3010,7 +3041,7 @@ exports[`Registration should not unregister fields when going back to step 2 onw
                                   class="flex flex-col w-1/2 justify-center px-4 py-2"
                                 >
                                   <span
-                                    class="sc-fzolEj gcosPd"
+                                    class="sc-fznWOq evvoWC"
                                   >
                                     Transaction Amount
                                   </span>
@@ -3025,7 +3056,7 @@ exports[`Registration should not unregister fields when going back to step 2 onw
                                   class="flex flex-col w-1/2 justify-center px-4 py-2 text-right"
                                 >
                                   <span
-                                    class="sc-fzolEj gcosPd"
+                                    class="sc-fznWOq evvoWC"
                                   >
                                     Transaction Fee
                                   </span>
@@ -3059,7 +3090,7 @@ exports[`Registration should not unregister fields when going back to step 2 onw
                               class="flex flex-col items-center py-6 border-t rounded-b-lg border-theme-neutral-300 justfiy-center bg-theme-neutral-contrast"
                             >
                               <span
-                                class="sc-fzolEj gcosPd"
+                                class="sc-fznWOq evvoWC"
                               >
                                 Total Amount
                               </span>
@@ -3214,7 +3245,7 @@ exports[`Registration should render 1st step 1`] = `
       >
         <div>
           <button
-            class="sc-fzqBkg hKoddb SelectAddress  "
+            class="sc-fzolEj kkRTJY SelectAddress  "
             data-testid="SelectAddress__wrapper"
             type="button"
           >
@@ -3276,33 +3307,68 @@ exports[`Registration should render 1st step 1`] = `
           value="delegateRegistration"
         />
         <div
-          class="relative w-full cursor-pointer"
+          class="relative w-full"
         >
-          <div>
-            <button
-              aria-expanded="false"
-              aria-haspopup="listbox"
-              aria-labelledby="downshift-10-label downshift-10-toggle-button"
-              class="sc-fznxKY ftvzgS  is-selected "
-              data-testid="select-list__toggle-button"
-              id="downshift-10-toggle-button"
-              type="button"
-            >
-              Delegate
-            </button>
+          <div
+            aria-expanded="true"
+            aria-haspopup="listbox"
+            aria-owns="downshift-21-menu"
+            role="combobox"
+          >
+            <label
+              for="downshift-20-input"
+              id="downshift-21-label"
+            />
+            <div
+              class="sc-fzpjYC dHxzen"
+              data-testid="SelectDropdownInput"
+            >
+              <span
+                class="sc-fzoyAV gCfUUB py-3 pl-4 font-normal border border-transparent opacity-50 pointer-events-none"
+                data-testid="SelectDropdownInput__typeahead"
+              >
+                Delegate
+              </span>
+              <input
+                aria-activedescendant="downshift-21-item-0"
+                aria-autocomplete="list"
+                aria-controls="downshift-21-menu"
+                aria-labelledby="downshift-21-label"
+                autocomplete="off"
+                class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
+                data-testid="SelectDropdownInput__input"
+                id="downshift-20-input"
+                name="registrationType"
+                placeholder="Select option"
+                value="Delegate"
+              />
+            </div>
             <ul
-              aria-labelledby="downshift-10-label"
-              class="sc-fznMAR hjPwmz"
-              id="downshift-10-menu"
+              aria-labelledby="downshift-21-label"
+              class="sc-fznxKY erNwxN is-open"
+              id="downshift-21-menu"
               role="listbox"
-              tabindex="-1"
-            />
+            >
+              <li
+                aria-selected="true"
+                class="select-list-option is-highlighted"
+                data-testid="select-list__toggle-option-0"
+                id="downshift-21-item-0"
+                role="option"
+              >
+                <div
+                  class="select-list-option__label"
+                >
+                  Delegate
+                </div>
+              </li>
+            </ul>
           </div>
           <div
             class="sc-fzoyAV sc-fzoXzr YtqIf w-10 pointer-events-none text-theme-neutral"
           >
             <div
-              class="sc-AxiKw jNSjzx"
+              class="sc-AxiKw jNSjzx transform rotate-180"
               height="5"
               width="7"
             >
@@ -3784,7 +3850,7 @@ exports[`Registration should render registration form without selected wallet 1`
                           value=""
                         />
                         <div
-                          class="relative w-full cursor-pointer"
+                          class="relative w-full"
                         >
                           <div
                             aria-expanded="false"
@@ -4361,7 +4427,7 @@ exports[`Registration should select cryptoasset first and see select address inp
                           value=""
                         />
                         <div
-                          class="relative w-full cursor-pointer"
+                          class="relative w-full"
                         >
                           <div
                             aria-expanded="false"
@@ -4963,7 +5029,7 @@ exports[`Registration should select cryptoasset with unavailable wallets and see
                           value=""
                         />
                         <div
-                          class="relative w-full cursor-pointer"
+                          class="relative w-full"
                         >
                           <div
                             aria-expanded="false"
@@ -5369,7 +5435,7 @@ exports[`Registration should select registration type & show form 1`] = `
                         class="flex rounded-lg overflow-hidden bg-theme-warning"
                       >
                         <div
-                          class="sc-fzoxKX habbCf flex items-center justify-center text-theme-warning bg-theme-warning-200"
+                          class="sc-fzqPZZ hQmpwy flex items-center justify-center text-theme-warning bg-theme-warning-200"
                         >
                           <div
                             class="sc-AxiKw iRsrJT"
@@ -5382,7 +5448,7 @@ exports[`Registration should select registration type & show form 1`] = `
                           </div>
                         </div>
                         <div
-                          class="sc-fzqPZZ jgngte flex-1 bg-theme-warning-100 space-y-2"
+                          class="sc-fzqBkg czMUCU flex-1 bg-theme-warning-100 space-y-2"
                         >
                           <div
                             class="text-sm"
@@ -5925,7 +5991,7 @@ exports[`Registration should should go back and forth & correctly register field
                         class="flex rounded-lg overflow-hidden bg-theme-warning"
                       >
                         <div
-                          class="sc-fzoxKX habbCf flex items-center justify-center text-theme-warning bg-theme-warning-200"
+                          class="sc-fzqPZZ hQmpwy flex items-center justify-center text-theme-warning bg-theme-warning-200"
                         >
                           <div
                             class="sc-AxiKw iRsrJT"
@@ -5938,7 +6004,7 @@ exports[`Registration should should go back and forth & correctly register field
                           </div>
                         </div>
                         <div
-                          class="sc-fzqPZZ jgngte flex-1 bg-theme-warning-100 space-y-2"
+                          class="sc-fzqBkg czMUCU flex-1 bg-theme-warning-100 space-y-2"
                         >
                           <div
                             class="text-sm"
@@ -7290,7 +7356,7 @@ exports[`Registration should validate description 1`] = `
                               class="font-semibold"
                             >
                               <div
-                                class="sc-fznWOq leTOwr flex flex-col font-normal"
+                                class="sc-fznMAR ecTYIw flex flex-col font-normal"
                                 data-testid="LinkCollection"
                               >
                                 <div
@@ -7334,7 +7400,7 @@ exports[`Registration should validate description 1`] = `
                               class="font-semibold"
                             >
                               <div
-                                class="sc-fznWOq leTOwr flex flex-col font-normal"
+                                class="sc-fznMAR ecTYIw flex flex-col font-normal"
                                 data-testid="LinkCollection"
                               >
                                 <div
@@ -7378,7 +7444,7 @@ exports[`Registration should validate description 1`] = `
                               class="font-semibold"
                             >
                               <div
-                                class="sc-fznWOq leTOwr flex flex-col font-normal"
+                                class="sc-fznMAR ecTYIw flex flex-col font-normal"
                                 data-testid="LinkCollection"
                               >
                                 <div
@@ -7957,7 +8023,7 @@ exports[`Registration should validate display name 1`] = `
                               class="font-semibold"
                             >
                               <div
-                                class="sc-fznWOq leTOwr flex flex-col font-normal"
+                                class="sc-fznMAR ecTYIw flex flex-col font-normal"
                                 data-testid="LinkCollection"
                               >
                                 <div
@@ -8001,7 +8067,7 @@ exports[`Registration should validate display name 1`] = `
                               class="font-semibold"
                             >
                               <div
-                                class="sc-fznWOq leTOwr flex flex-col font-normal"
+                                class="sc-fznMAR ecTYIw flex flex-col font-normal"
                                 data-testid="LinkCollection"
                               >
                                 <div
@@ -8045,7 +8111,7 @@ exports[`Registration should validate display name 1`] = `
                               class="font-semibold"
                             >
                               <div
-                                class="sc-fznWOq leTOwr flex flex-col font-normal"
+                                class="sc-fznMAR ecTYIw flex flex-col font-normal"
                                 data-testid="LinkCollection"
                               >
                                 <div
@@ -8624,7 +8690,7 @@ exports[`Registration should validate entity name 1`] = `
                               class="font-semibold"
                             >
                               <div
-                                class="sc-fznWOq leTOwr flex flex-col font-normal"
+                                class="sc-fznMAR ecTYIw flex flex-col font-normal"
                                 data-testid="LinkCollection"
                               >
                                 <div
@@ -8668,7 +8734,7 @@ exports[`Registration should validate entity name 1`] = `
                               class="font-semibold"
                             >
                               <div
-                                class="sc-fznWOq leTOwr flex flex-col font-normal"
+                                class="sc-fznMAR ecTYIw flex flex-col font-normal"
                                 data-testid="LinkCollection"
                               >
                                 <div
@@ -8712,7 +8778,7 @@ exports[`Registration should validate entity name 1`] = `
                               class="font-semibold"
                             >
                               <div
-                                class="sc-fznWOq leTOwr flex flex-col font-normal"
+                                class="sc-fznMAR ecTYIw flex flex-col font-normal"
                                 data-testid="LinkCollection"
                               >
                                 <div
@@ -9291,7 +9357,7 @@ exports[`Registration should validate website url 1`] = `
                               class="font-semibold"
                             >
                               <div
-                                class="sc-fznWOq leTOwr flex flex-col font-normal"
+                                class="sc-fznMAR ecTYIw flex flex-col font-normal"
                                 data-testid="LinkCollection"
                               >
                                 <div
@@ -9335,7 +9401,7 @@ exports[`Registration should validate website url 1`] = `
                               class="font-semibold"
                             >
                               <div
-                                class="sc-fznWOq leTOwr flex flex-col font-normal"
+                                class="sc-fznMAR ecTYIw flex flex-col font-normal"
                                 data-testid="LinkCollection"
                               >
                                 <div
@@ -9379,7 +9445,7 @@ exports[`Registration should validate website url 1`] = `
                               class="font-semibold"
                             >
                               <div
-                                class="sc-fznWOq leTOwr flex flex-col font-normal"
+                                class="sc-fznMAR ecTYIw flex flex-col font-normal"
                                 data-testid="LinkCollection"
                               >
                                 <div

From a6a6fe849c22a3882e0a5014d0a4db0fbe2789d9 Mon Sep 17 00:00:00 2001
From: brenopolanski <breno.polanski@gmail.com>
Date: Tue, 13 Oct 2020 22:24:35 -0300
Subject: [PATCH 08/13] test: increate test coverage to 100%

---
 .../SelectDropdown/SelectDropdown.test.tsx    | 176 +++++++++++++++++-
 .../LinkCollection/LinkCollection.test.tsx    |   2 +-
 2 files changed, 172 insertions(+), 6 deletions(-)

diff --git a/src/app/components/SelectDropdown/SelectDropdown.test.tsx b/src/app/components/SelectDropdown/SelectDropdown.test.tsx
index 9aadf67bd2..9c4e67b462 100644
--- a/src/app/components/SelectDropdown/SelectDropdown.test.tsx
+++ b/src/app/components/SelectDropdown/SelectDropdown.test.tsx
@@ -1,6 +1,6 @@
 import { act } from "@testing-library/react-hooks";
 import React from "react";
-import { fireEvent, render } from "testing-library";
+import { fireEvent, render, waitFor } from "testing-library";
 
 import { Select } from "./SelectDropdown";
 
@@ -57,7 +57,7 @@ describe("SelectDropdown", () => {
 
 	it("should toggle select list options", () => {
 		const options = [{ label: "Option 1", value: "1" }];
-		const { getByTestId } = render(<Select options={options} defaultValue="3" />);
+		const { getByTestId } = render(<Select options={options} />);
 
 		const selectDropdown = getByTestId("SelectDropdownInput__input");
 
@@ -75,7 +75,7 @@ describe("SelectDropdown", () => {
 
 	it("should select option", () => {
 		const options = [{ label: "Option 1", value: "1" }];
-		const { getByTestId } = render(<Select options={options} defaultValue="3" />);
+		const { getByTestId } = render(<Select options={options} />);
 
 		const selectDropdown = getByTestId("SelectDropdownInput__input");
 
@@ -95,7 +95,7 @@ describe("SelectDropdown", () => {
 
 	it("should highlight option", () => {
 		const options = [{ label: "Option 1", value: "1" }];
-		const { getByTestId } = render(<Select options={options} defaultValue="3" />);
+		const { getByTestId } = render(<Select options={options} />);
 
 		const selectDropdown = getByTestId("SelectDropdownInput__input");
 
@@ -115,7 +115,7 @@ describe("SelectDropdown", () => {
 
 	it("should select options with arrow keys", () => {
 		const options = [{ label: "Option 1", value: "1" }];
-		const { getByTestId } = render(<Select options={options} defaultValue="3" />);
+		const { getByTestId } = render(<Select options={options} />);
 
 		const selectDropdown = getByTestId("SelectDropdownInput__input");
 
@@ -150,4 +150,170 @@ describe("SelectDropdown", () => {
 
 		expect(getByTestId("select-list__input")).toHaveValue("1");
 	});
+
+	it("should show typeahead when typing has found at least one match", () => {
+		const { getByTestId } = render(<Select options={options} />);
+		const selectDropdown = getByTestId("SelectDropdownInput__input");
+
+		act(() => {
+			fireEvent.change(selectDropdown, { target: { value: "Opt" } });
+		});
+
+		expect(getByTestId("SelectDropdownInput__typeahead")).toHaveTextContent("Option 1");
+	});
+
+	it("should select first matching option with enter", () => {
+		const { getByTestId } = render(<Select options={options} />);
+		const selectDropdown = getByTestId("SelectDropdownInput__input");
+
+		act(() => {
+			fireEvent.change(selectDropdown, { target: { value: "Opt" } });
+		});
+
+		act(() => {
+			fireEvent.keyDown(selectDropdown, { key: "Enter", code: 13 });
+		});
+
+		expect(getByTestId("select-list__input")).toHaveValue("1");
+	});
+
+	it("should select first matching option with tab", () => {
+		const { getByTestId } = render(<Select options={options} />);
+		const selectDropdown = getByTestId("SelectDropdownInput__input");
+
+		act(() => {
+			fireEvent.change(selectDropdown, { target: { value: "Opt" } });
+		});
+
+		act(() => {
+			fireEvent.keyDown(selectDropdown, { key: "Tab", code: 9 });
+		});
+
+		expect(getByTestId("select-list__input")).toHaveValue("1");
+	});
+
+	it("should not select non-matching option after key input and tab", () => {
+		const { getByTestId } = render(<Select options={options} />);
+		const selectDropdown = getByTestId("SelectDropdownInput__input");
+
+		act(() => {
+			fireEvent.change(selectDropdown, { target: { value: "Optt" } });
+		});
+
+		act(() => {
+			fireEvent.keyDown(selectDropdown, { key: "Tab", code: 9 });
+		});
+
+		expect(getByTestId("select-list__input")).toHaveValue("");
+	});
+
+	it("should not select first matched option after random key enter", () => {
+		const { getByTestId } = render(<Select options={options} />);
+		const selectDropdown = getByTestId("SelectDropdownInput__input");
+
+		act(() => {
+			fireEvent.change(selectDropdown, { target: { value: "Opt" } });
+		});
+
+		act(() => {
+			fireEvent.keyDown(selectDropdown, { key: "A", code: 65 });
+		});
+
+		expect(getByTestId("select-list__input")).toHaveValue("");
+	});
+
+	it("should clear selection when changing input", () => {
+		const { getByTestId } = render(<Select options={options} />);
+		const selectDropdown = getByTestId("SelectDropdownInput__input");
+
+		act(() => {
+			fireEvent.change(selectDropdown, { target: { value: "Opt" } });
+		});
+
+		act(() => {
+			fireEvent.keyDown(selectDropdown, { key: "Enter", code: 13 });
+		});
+
+		expect(getByTestId("select-list__input")).toHaveValue("1");
+
+		act(() => {
+			fireEvent.change(selectDropdown, { target: { value: "test" } });
+		});
+
+		act(() => {
+			fireEvent.keyDown(selectDropdown, { key: "A", code: 65 });
+		});
+		act(() => {
+			fireEvent.keyDown(selectDropdown, { key: "B", code: 65 });
+		});
+
+		expect(getByTestId("select-list__input")).toHaveValue("");
+	});
+
+	it("should select match on blur if available", async () => {
+		const { getByTestId } = render(<Select options={options} />);
+		const selectDropdown = getByTestId("SelectDropdownInput__input");
+
+		act(() => {
+			fireEvent.change(selectDropdown, { target: { value: "Opt" } });
+		});
+
+		act(() => {
+			fireEvent.blur(selectDropdown);
+		});
+
+		await waitFor(() => expect(selectDropdown).toHaveValue("Option 1"));
+	});
+
+	it("should clear input on blur if there is no match", async () => {
+		const { getByTestId } = render(<Select options={options} />);
+		const selectDropdown = getByTestId("SelectDropdownInput__input");
+
+		act(() => {
+			fireEvent.change(selectDropdown, { target: { value: "Foobar" } });
+		});
+
+		act(() => {
+			fireEvent.blur(selectDropdown);
+		});
+
+		await waitFor(() => expect(selectDropdown).toHaveValue(""));
+	});
+
+	it("should not clear input on blur if selected", () => {
+		const { getByTestId } = render(<Select options={options} />);
+		const selectDropdown = getByTestId("SelectDropdownInput__input");
+
+		act(() => {
+			fireEvent.change(selectDropdown, { target: { value: "Opt" } });
+		});
+
+		act(() => {
+			fireEvent.keyDown(selectDropdown, { key: "Enter", code: 13 });
+		});
+
+		expect(selectDropdown).toHaveValue("Option 1");
+
+		act(() => {
+			fireEvent.blur(selectDropdown);
+		});
+
+		expect(selectDropdown).toHaveValue("Option 1");
+	});
+
+	it("should select an option by clicking on it", async () => {
+		const { getByTestId } = render(<Select options={options} />);
+
+		act(() => {
+			fireEvent.focus(getByTestId("SelectDropdownInput__input"));
+		});
+
+		await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
+
+		act(() => {
+			fireEvent.mouseDown(getByTestId("select-list__toggle-option-0"));
+		});
+
+		expect(getByTestId("select-list__input")).toHaveValue("1");
+	});
 });
diff --git a/src/domains/transaction/components/LinkCollection/LinkCollection.test.tsx b/src/domains/transaction/components/LinkCollection/LinkCollection.test.tsx
index 5ec7489554..68fe30cfec 100644
--- a/src/domains/transaction/components/LinkCollection/LinkCollection.test.tsx
+++ b/src/domains/transaction/components/LinkCollection/LinkCollection.test.tsx
@@ -64,7 +64,7 @@ describe("LinkCollection", () => {
 	it("should add links", async () => {
 		const onChange = jest.fn();
 
-		const { asFragment, getAllByTestId, getByTestId } = render(
+		const { asFragment, getByTestId } = render(
 			<LinkCollection
 				title="Social Media"
 				description="Tell people more about yourself through social media"

From fa95244db8b31f34217cbb960a0fe523b0298a10 Mon Sep 17 00:00:00 2001
From: brenopolanski <breno.polanski@gmail.com>
Date: Tue, 13 Oct 2020 23:00:16 -0300
Subject: [PATCH 09/13] test: fix e2e tests

---
 src/domains/profile/e2e/create-profile-action.e2e.ts     | 8 ++++----
 src/domains/setting/e2e/save-settings.e2e.ts             | 4 ++--
 src/domains/transaction/e2e/delegate-registration.e2e.ts | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/domains/profile/e2e/create-profile-action.e2e.ts b/src/domains/profile/e2e/create-profile-action.e2e.ts
index e5bcc0ac16..376e2986ae 100644
--- a/src/domains/profile/e2e/create-profile-action.e2e.ts
+++ b/src/domains/profile/e2e/create-profile-action.e2e.ts
@@ -24,8 +24,8 @@ test("should create a profile and navigate to welcome screen", async (t) => {
 	await t.expect(getLocation()).contains("/profiles/create");
 
 	await t.typeText(nameInput, "Anne Doe");
-	await t.click(Selector("button").withText("Select Currency"));
-	await t.click(Selector("li.select-list-option").withText("ETH"));
+	await t.click('[data-testid="SelectDropdownInput__input"]');
+	await t.click('[data-testid="select-list__toggle-option-0"]');
 	await t.click(Selector("input[name=isDarkMode]").parent());
 	await t.click(Selector("button").withExactText(translations.COMMON.CREATE));
 
@@ -44,8 +44,8 @@ test("should create a profile with password and navigate to welcome screen", asy
 
 	await t.typeText(nameInput, "Joe Bloggs");
 	await t.typeText(Selector("input[name=password]"), "password");
-	await t.click(Selector("button").withText("Select Currency"));
-	await t.click(Selector("li.select-list-option").withText("ETH"));
+	await t.click('[data-testid="SelectDropdownInput__input"]');
+	await t.click('[data-testid="select-list__toggle-option-0"]');
 	await t.click(Selector("input[name=isDarkMode]").parent());
 	await t.click(Selector("button").withExactText(translations.COMMON.CREATE));
 
diff --git a/src/domains/setting/e2e/save-settings.e2e.ts b/src/domains/setting/e2e/save-settings.e2e.ts
index 006b403b2f..2205aef7a8 100644
--- a/src/domains/setting/e2e/save-settings.e2e.ts
+++ b/src/domains/setting/e2e/save-settings.e2e.ts
@@ -22,8 +22,8 @@ test("should save settings", async (t) => {
 	await t.click(Selector("[data-testid=AdvancedMode__accept-button]"));
 	await t.expect(Selector("[data-testid=modal__inner]").exists).notOk();
 
-	await t.click(Selector("button").withText("1 minute"));
-	await t.click(Selector("li.select-list-option").withText("10 minutes"));
+	await t.click(Selector("[data-testid=SelectDropdownInput__typeahead]").withText("1 minute"));
+	await t.click('[data-testid="select-list__toggle-option-2"]');
 
 	await t.click(Selector("input[name=isDarkMode]").parent());
 	await t.click(Selector("input[name=isUpdateLedger]").parent());
diff --git a/src/domains/transaction/e2e/delegate-registration.e2e.ts b/src/domains/transaction/e2e/delegate-registration.e2e.ts
index 10a55be431..547ed1e6f3 100644
--- a/src/domains/transaction/e2e/delegate-registration.e2e.ts
+++ b/src/domains/transaction/e2e/delegate-registration.e2e.ts
@@ -43,8 +43,8 @@ test("should successfully submit delegate registration", async (t) => {
 	await t.click(Selector("[data-testid=SearchWalletListItem__select-2]"));
 
 	// Choose registration type & go to step 2
-	await t.click(Selector("[data-testid=select-list__toggle-button]"));
-	await t.click(Selector("li").withText(translations.COMMON.DELEGATE));
+	await t.click('[data-testid="SelectDropdownInput__input"]');
+	await t.click('[data-testid="select-list__toggle-option-1"]');
 	await t.click(Selector("button").withText(translations.COMMON.CONTINUE));
 
 	// Choose username

From 2067d7c3807637964824bd6ff06fde8d766957bd Mon Sep 17 00:00:00 2001
From: brenopolanski <breno.polanski@gmail.com>
Date: Wed, 14 Oct 2020 10:08:17 -0300
Subject: [PATCH 10/13] test: update snapshots

---
 .../__snapshots__/SendTransfer.test.tsx.snap  | 574 ++++--------------
 1 file changed, 131 insertions(+), 443 deletions(-)

diff --git a/src/domains/transaction/pages/SendTransfer/__snapshots__/SendTransfer.test.tsx.snap b/src/domains/transaction/pages/SendTransfer/__snapshots__/SendTransfer.test.tsx.snap
index af1128e1d0..96cd4a56ba 100644
--- a/src/domains/transaction/pages/SendTransfer/__snapshots__/SendTransfer.test.tsx.snap
+++ b/src/domains/transaction/pages/SendTransfer/__snapshots__/SendTransfer.test.tsx.snap
@@ -1726,47 +1726,11 @@ exports[`SendTransfer should render 1st step with deeplink values and use them 1
       <div
         class="text-theme-neutral-dark"
       >
-        Review the transaction details before sending
-      </div>
-    </div>
-    <div
-      class="sc-fznyAO fQmAFD"
-      data-testid="TransactionDetail"
-    >
-      <div
-        class="flex-1 space-y-2"
-      >
-        <div
-          class="text-sm font-semibold text-theme-neutral"
-        >
-          Cryptoasset
-        </div>
-        <div
-          class="font-semibold"
-        >
-          ARK Devnet
-        </div>
-      </div>
-      <div
-        aria-label="ARK Devnet"
-        class="sc-AxgMl eqWWwc border-theme-primary-100 text-theme-primary-400"
-        data-testid="NetworkIcon-ARK-ark.devnet"
-      >
-        <div
-          class="sc-AxiKw dklFyP"
-          data-testid="NetworkIcon__icon"
-          height="20"
-          width="20"
-        >
-          <svg>
-            ark.svg
-          </svg>
-        </div>
+        Enter details to send your money
       </div>
     </div>
     <div
-      class="sc-fznyAO iykGTc"
-      data-testid="TransactionDetail"
+      class="mt-8"
     >
       <div
         class="space-y-8 SendTransactionForm"
@@ -1802,11 +1766,11 @@ exports[`SendTransfer should render 1st step with deeplink values and use them 1
                 id="SendTransactionForm__network-label"
               />
               <div
-                class="sc-fzoLag hoOQgq"
+                class="sc-fzpjYC dHxzen"
                 data-testid="SelectNetworkInput"
               >
                 <div
-                  class="sc-fzqBZW sc-fzqNJr gNHBIw px-4"
+                  class="sc-fzoyAV sc-fzoLag grqxuS px-4"
                 >
                   <div
                     class="sc-AxgMl eLFBRi border-theme-neutral-light text-theme-neutral"
@@ -1818,7 +1782,7 @@ exports[`SendTransfer should render 1st step with deeplink values and use them 1
                   aria-controls="SendTransactionForm__network-menu"
                   aria-labelledby="SendTransactionForm__network-label"
                   autocomplete="off"
-                  class="sc-fzokOt iLiRks overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 pl-15"
+                  class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 pl-15"
                   data-testid="SelectNetworkInput__input"
                   id="SendTransactionForm__network-input"
                   placeholder="Enter a cryptoasset name"
@@ -1833,36 +1797,9 @@ exports[`SendTransfer should render 1st step with deeplink values and use them 1
               role="listbox"
             />
           </div>
-      </div>
-      <div
-        class="Avatar__AvatarWrapper-sc-1vsy2s2-0 eHceTZ"
-        data-testid="Avatar"
-      >
-        <div
-          class="w-full h-full"
-        >
-          <img
-            alt="D8rr7B1d6TL6pf14LgMz4sKp1VBMs6YUYD"
-            src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(0, 150, 136)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"50\\" cx=\\"80\\" cy=\\"50\\" fill=\\"rgb(76, 175, 80)\\"/><circle r=\\"35\\" cx=\\"100\\" cy=\\"40\\" fill=\\"rgb(156, 39, 176)\\"/><circle r=\\"40\\" cx=\\"90\\" cy=\\"70\\" fill=\\"rgb(3, 169, 244)\\"/></svg>"
-            title="D8rr7B1d6TL6pf14LgMz4sKp1VBMs6YUYD"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      class="sc-fznyAO iykGTc"
-      data-testid="TransactionDetail"
-    >
-      <div
-        class="flex-1 space-y-2"
-      >
-        <div
-          class="text-sm font-semibold text-theme-neutral"
-        >
-          Recipient
-        </div>
-        <div
-          class="font-semibold"
+        </fieldset>
+        <fieldset
+          class="sc-AxirZ izhStr relative"
         >
           <div
             class="mb-2"
@@ -1879,68 +1816,6 @@ exports[`SendTransfer should render 1st step with deeplink values and use them 1
               />
             </label>
           </div>
-        </div>
-      </div>
-      <div
-        class="Avatar__AvatarWrapper-sc-1vsy2s2-0 eHceTZ"
-        data-testid="Avatar"
-      >
-        <div
-          class="w-full h-full"
-        >
-          <img
-            alt="D8rr7B1d6TL6pf14LgMz4sKp1VBMs6YUYD"
-            src="data:image/svg+xml;utf8,<svg version=\\"1.1\\" xmlns=\\"http://www.w3.org/2000/svg\\" width=\\"100\\" height=\\"100\\" viewBox=\\"0 0 100 100\\"><style>circle{mix-blend-mode:soft-light;}</style><rect fill=\\"rgb(0, 150, 136)\\" width=\\"100\\" height=\\"100\\"/><circle r=\\"50\\" cx=\\"80\\" cy=\\"50\\" fill=\\"rgb(76, 175, 80)\\"/><circle r=\\"35\\" cx=\\"100\\" cy=\\"40\\" fill=\\"rgb(156, 39, 176)\\"/><circle r=\\"40\\" cx=\\"90\\" cy=\\"70\\" fill=\\"rgb(3, 169, 244)\\"/></svg>"
-            title="D8rr7B1d6TL6pf14LgMz4sKp1VBMs6YUYD"
-          />
-        </div>
-      </div>
-    </div>
-    <div
-      class="sc-fznyAO iykGTc"
-      data-testid="TransactionDetail"
-    >
-      <div
-        class="flex-1 space-y-2"
-      >
-        <div
-          class="text-sm font-semibold text-theme-neutral"
-        >
-          Smartbridge
-        </div>
-        <div
-          class="font-semibold"
-        >
-          <p
-            class="break-all"
-          >
-            test smartbridge
-          </p>
-        </div>
-      </div>
-      <div
-        class="flex justify-center w-11"
-      >
-        <div
-          class="sc-AxiKw iqnvgO"
-          height="22"
-          width="18"
-        >
-          <svg>
-            smartbridge.svg
-          </svg>
-        </div>
-      </div>
-    </div>
-    <div
-      class="mt-2"
-    >
-      <div
-        class="border rounded-lg border-theme-neutral-300"
-      >
-        <div
-          class="relative p-4"
-        >
           <div
             data-testid="sender-address"
           >
@@ -1950,104 +1825,37 @@ exports[`SendTransfer should render 1st step with deeplink values and use them 1
                 data-testid="SelectAddress__wrapper"
                 type="button"
               >
-                Transaction Amount
-              </span>
-              <span
-                class="mt-1 text-lg font-semibold"
-                data-testid="total-amount-box__transaction-amount"
-              >
-                1 DARK
-              </span>
-            </div>
-            <div
-              class="flex flex-col w-1/2 justify-center px-4 py-2 text-right"
-            >
-              <span
-                class="sc-fznMAR jjjiZV"
-              >
-                Transaction Fee
-              </span>
-              <span
-                class="mt-1 text-lg font-semibold"
-                data-testid="total-amount-box__transaction-fee"
-              >
-                0.1 DARK
-              </span>
-            </div>
-          </div>
-          <div
-            class="absolute transform top-1/2 -translate-y-1/2 left-1/2 -translate-x-1/2"
-          >
-            <div
-              class="py-2 ml-px bg-theme-background"
-            >
-              <div
-                class="sc-AxiKw kgmJgX"
-                height="14"
-                width="14"
-              >
-                <svg>
-                  plus.svg
-                </svg>
-              </div>
+                <div
+                  class="sc-AxgMl eLFBRi mx-4 bg-theme-neutral-200 border-theme-neutral-200"
+                />
+                <div
+                  class="inline-block truncate align-middle"
+                />
+                <div
+                  class="absolute flex items-center space-x-3 right-4"
+                >
+                  <div
+                    class="sc-AxiKw dklFyP"
+                    height="20"
+                    width="20"
+                  >
+                    <svg>
+                      user.svg
+                    </svg>
+                  </div>
+                </div>
+              </button>
+              <input
+                class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 hidden"
+                data-testid="SelectAddress__input"
+                name="senderAddress"
+                readonly=""
+                type="text"
+                value=""
+              />
             </div>
           </div>
-        </div>
-        <div
-          class="flex flex-col items-center py-6 border-t rounded-b-lg border-theme-neutral-300 justfiy-center bg-theme-neutral-contrast"
-        >
-          <span
-            class="sc-fznMAR jjjiZV"
-          >
-            Total Amount
-          </span>
-          <span
-            class="text-2xl font-bold"
-            data-testid="total-amount-box__total"
-          >
-            1.1 DARK
-          </span>
-        </div>
-      </div>
-    </div>
-  </section>
-</DocumentFragment>
-`;
-
-exports[`SendTransfer should render 4th step (summary) 1`] = `
-<DocumentFragment>
-  <section
-    class="space-y-8"
-    data-testid="TransactionSuccessful"
-  >
-    <div
-      class="flex items-end justify-between bg-theme-background"
-    >
-      <div>
-        <h1
-          class="mb-0 md:text-4xl"
-          data-testid="header__title"
-        >
-          Transaction Sent
-        </h1>
-      </div>
-    </div>
-    <svg
-      class="w-full"
-    >
-      transaction_successful.svg
-    </svg>
-    <p
-      class="text-theme-neutral-dark"
-    >
-      Your transaction was successfully sent. Please monitor the blockchain to ensure your transaction is confirmed and processed. The following is relevant information for your transaction:
-    </p>
-    <div>
-      <div
-        class="sc-fznyAO laljlJ"
-        data-testid="TransactionDetail"
-      >
-
+        </fieldset>
         <div
           data-testid="recipient-address"
         >
@@ -2057,23 +1865,8 @@ exports[`SendTransfer should render 4th step (summary) 1`] = `
             <div
               class="text-theme-neutral-dark hover:text-theme-primary"
             >
-
-              <a
-                class="sc-fznKkj drQiih inline-flex items-center font-semibold transition-colors duration-200 cursor-pointer text-theme-primary hover:text-theme-primary-dark hover:underline active:text-theme-primary-500"
-                data-testid="Link"
-                rel="noopener noreferrer"
-                to="https://dexplorer.ark.io/transaction/8f913b6b719e7767d49861c0aec79ced212767645cb793d75d2f1b89abb49877"
-              >
-                <span
-                  class="sc-fzpans kkFAbe text-theme-primary-dark"
-                  data-testid="TruncateMiddle"
-                >
-                  8f913b6b719e7…f1b89abb49877
-                </span>
-              </a>
-              <span
-                class="flex ml-5 text-theme-primary-300"
-
+              <div
+                class="flex items-center mb-2 space-x-2"
               >
                 <div
                   class="font-normal transition-colors duration-100 text-md"
@@ -2108,7 +1901,7 @@ exports[`SendTransfer should render 4th step (summary) 1`] = `
                   Single
                 </button>
                 <button
-                  class="sc-AxjAm fPpool flex-1 border-l-0"
+                  class="sc-AxjAm hXnHfM flex-1 border-l-0"
                   color="primary"
                   data-testid="add-recipient-is-multiple-toggle"
                   type="button"
@@ -2117,59 +1910,6 @@ exports[`SendTransfer should render 4th step (summary) 1`] = `
                 </button>
               </div>
             </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="sc-fznyAO iykGTc"
-        data-testid="TransactionDetail"
-      >
-        <div
-          class="flex-1 space-y-2"
-        >
-          <div
-            class="text-sm font-semibold text-theme-neutral"
-          >
-            Cryptoasset
-          </div>
-          <div
-            class="font-semibold"
-          >
-            ARK Devnet
-          </div>
-        </div>
-        <div
-          aria-label="ARK Devnet"
-          class="sc-AxgMl eqWWwc border-theme-primary-100 text-theme-primary-400"
-          data-testid="NetworkIcon-ARK-ark.devnet"
-        >
-          <div
-            class="sc-AxiKw dklFyP"
-            data-testid="NetworkIcon__icon"
-            height="20"
-            width="20"
-          >
-            <svg>
-              ark.svg
-            </svg>
-          </div>
-        </div>
-      </div>
-      <div
-        class="sc-fznyAO iykGTc"
-        data-testid="TransactionDetail"
-      >
-        <div
-          class="flex-1 space-y-2"
-        >
-          <div
-            class="text-sm font-semibold text-theme-neutral"
-          >
-            <span
-              class="mr-1"
-            >
-              Sender
-            </span>
             <div
               class="SubForm__SubFormWrapper-c4tqfs-0 gIKSHW mt-6"
             >
@@ -2218,7 +1958,7 @@ exports[`SendTransfer should render 4th step (summary) 1`] = `
                         </div>
                       </div>
                       <input
-                        class="sc-fzokOt iLiRks overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 pl-14 pr-11"
+                        class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 pl-14 pr-11"
                         data-testid="SelectRecipient__input"
                         name="recipientAddress"
                         type="text"
@@ -2260,10 +2000,10 @@ exports[`SendTransfer should render 4th step (summary) 1`] = `
                     </label>
                   </div>
                   <div
-                    class="sc-fzoLag hoOQgq"
+                    class="sc-fzpjYC dHxzen"
                   >
                     <input
-                      class="sc-fzokOt iLiRks overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 pr-20"
+                      class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 pr-20"
                       data-testid="add-recipient__amount-input"
                       name="amount"
                       placeholder="Amount"
@@ -2271,7 +2011,7 @@ exports[`SendTransfer should render 4th step (summary) 1`] = `
                       value="1.2"
                     />
                     <div
-                      class="sc-fzqBZW sc-fzoyAV icrEyZ"
+                      class="sc-fzoyAV sc-fzoXzr YtqIf"
                     >
                       <button
                         class="h-12 pl-6 pr-3 mr-1 text-theme-primary focus:outline-none"
@@ -2290,49 +2030,26 @@ exports[`SendTransfer should render 4th step (summary) 1`] = `
         <fieldset
           class="sc-AxirZ izhStr relative"
         >
-          <div
-            class="mb-2"
-          >
-            <label
-              class="flex inline-block mb-2 text-sm font-semibold transition-colors duration-100 FormLabel text-theme-neutral-dark"
-              data-testid="FormLabel"
-              for="smartbridge"
-            >
-              Smartbridge
-              <div
-                class="w-1 h-1 mt-1 ml-1 rounded-full bg-theme-danger-400"
-                data-testid="FormLabel__required"
-              />
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="sc-fznyAO iykGTc"
-        data-testid="TransactionDetail"
-      >
-        <div
-          class="flex-1 space-y-2"
-        >
-          <div
-            class="text-sm font-semibold text-theme-neutral"
+          <label
+            class="flex inline-block mb-2 text-sm font-semibold transition-colors duration-100 FormLabel text-theme-neutral-dark"
+            data-testid="FormLabel"
+            for="smartbridge"
           >
-            Recipient
-          </div>
+            Smartbridge
+          </label>
           <div
-            class="sc-fzoLag hoOQgq"
+            class="sc-fzpjYC dHxzen"
           >
             <input
-              class="sc-fzokOt iLiRks overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 pr-24"
+              class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 pr-24"
               data-testid="Input__smartbridge"
-              maxlength="255"
               name="smartbridge"
               placeholder=" "
               type="text"
               value=""
             />
             <div
-              class="sc-fzqBZW sc-fzoyAV icrEyZ px-2 text-sm pointer-events-none text-theme-neutral"
+              class="sc-fzoyAV sc-fzoXzr YtqIf px-2 text-sm pointer-events-none text-theme-neutral"
               data-testid="InputCounter__counter"
             >
               0/255
@@ -2352,36 +2069,7 @@ exports[`SendTransfer should render 4th step (summary) 1`] = `
               class="w-1 h-1 mt-1 ml-1 rounded-full bg-theme-danger-400"
               data-testid="FormLabel__required"
             />
-
-          </div>
-        </div>
-      </div>
-      <div
-        class="sc-fznyAO hJHVee"
-        data-testid="TransactionDetail"
-      >
-        <div
-          class="flex-1 space-y-2"
-        >
-          <div
-            class="text-sm font-semibold text-theme-neutral"
-          >
-            Total Amount
-          </div>
-          <div
-            class="font-semibold"
-          >
-            <span
-              data-testid="Amount"
-            >
-              400,000.1 DARK
-            </span>
-          </div>
-        </div>
-        <div
-          class="ml-1 text-theme-danger"
-        >
-
+          </label>
           <div
             class="flex space-x-2"
             data-testid="InputFee"
@@ -2390,10 +2078,10 @@ exports[`SendTransfer should render 4th step (summary) 1`] = `
               class="flex-1"
             >
               <div
-                class="sc-fzoLag hoOQgq"
+                class="sc-fzpjYC dHxzen"
               >
                 <input
-                  class="sc-fzokOt iLiRks overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 "
+                  class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 "
                   data-testid="InputCurrency"
                   name="fee"
                   type="text"
@@ -2407,19 +2095,19 @@ exports[`SendTransfer should render 4th step (summary) 1`] = `
                     data-testid="Range"
                   >
                     <div
-                      class="sc-fzoXzr dYWnKg"
+                      class="sc-fznxsB iIkzuE"
                       data-testid="Range__track"
                       style="transform: scale(1); cursor: pointer;"
                     >
                       <div
-                        class="sc-fzpjYC csTNzu"
+                        class="sc-fznJRM csJQgR"
                         data-testid="Range__track__filled"
                       >
                         <div
                           aria-valuemax="2e-8"
                           aria-valuemin="0"
                           aria-valuenow="0"
-                          class="sc-fznxsB fjEYYX"
+                          class="sc-fznWqX dbpdEg"
                           data-testid="Range__thumb"
                           draggable="false"
                           role="slider"
@@ -2489,11 +2177,11 @@ exports[`SendTransfer should render 2nd step (review) 1`] = `
       <div
         class="text-theme-neutral-dark"
       >
-        Check the information again before voting
+        Review the transaction details before sending
       </div>
     </div>
     <div
-      class="sc-fznKkj bQquPG"
+      class="sc-fznyAO fQmAFD"
       data-testid="TransactionDetail"
     >
       <div
@@ -2528,7 +2216,7 @@ exports[`SendTransfer should render 2nd step (review) 1`] = `
       </div>
     </div>
     <div
-      class="sc-fznKkj bBFPlp"
+      class="sc-fznyAO iykGTc"
       data-testid="TransactionDetail"
     >
       <div
@@ -2594,7 +2282,7 @@ exports[`SendTransfer should render 2nd step (review) 1`] = `
       </div>
     </div>
     <div
-      class="sc-fznKkj bBFPlp"
+      class="sc-fznyAO iykGTc"
       data-testid="TransactionDetail"
     >
       <div
@@ -2636,7 +2324,7 @@ exports[`SendTransfer should render 2nd step (review) 1`] = `
       </div>
     </div>
     <div
-      class="sc-fznKkj bBFPlp"
+      class="sc-fznyAO iykGTc"
       data-testid="TransactionDetail"
     >
       <div
@@ -2718,7 +2406,7 @@ exports[`SendTransfer should render 2nd step (review) 1`] = `
             class="absolute transform top-1/2 -translate-y-1/2 left-1/2 -translate-x-1/2"
           >
             <div
-              class="py-2 ml-px bg-white"
+              class="py-2 ml-px bg-theme-background"
             >
               <div
                 class="sc-AxiKw kgmJgX"
@@ -2783,7 +2471,7 @@ exports[`SendTransfer should render 4th step (summary) 1`] = `
     </p>
     <div>
       <div
-        class="sc-fznKkj cYdjTE"
+        class="sc-fznyAO laljlJ"
         data-testid="TransactionDetail"
       >
         <div
@@ -2801,7 +2489,7 @@ exports[`SendTransfer should render 4th step (summary) 1`] = `
               class="flex items-center"
             >
               <a
-                class="sc-fzplWN bETMmw inline-flex items-center font-semibold transition-colors duration-200 cursor-pointer text-theme-primary hover:text-theme-primary-dark hover:underline active:text-theme-primary-500"
+                class="sc-fznKkj drQiih inline-flex items-center font-semibold transition-colors duration-200 cursor-pointer text-theme-primary hover:text-theme-primary-dark hover:underline active:text-theme-primary-500"
                 data-testid="Link"
                 rel="noopener noreferrer"
                 to="https://dexplorer.ark.io/transaction/8f913b6b719e7767d49861c0aec79ced212767645cb793d75d2f1b89abb49877"
@@ -2836,7 +2524,7 @@ exports[`SendTransfer should render 4th step (summary) 1`] = `
         </div>
       </div>
       <div
-        class="sc-fznKkj bBFPlp"
+        class="sc-fznyAO iykGTc"
         data-testid="TransactionDetail"
       >
         <div
@@ -2871,7 +2559,7 @@ exports[`SendTransfer should render 4th step (summary) 1`] = `
         </div>
       </div>
       <div
-        class="sc-fznKkj bBFPlp"
+        class="sc-fznyAO iykGTc"
         data-testid="TransactionDetail"
       >
         <div
@@ -2937,7 +2625,7 @@ exports[`SendTransfer should render 4th step (summary) 1`] = `
         </div>
       </div>
       <div
-        class="sc-fznKkj bBFPlp"
+        class="sc-fznyAO iykGTc"
         data-testid="TransactionDetail"
       >
         <div
@@ -2979,7 +2667,7 @@ exports[`SendTransfer should render 4th step (summary) 1`] = `
         </div>
       </div>
       <div
-        class="sc-fznKkj DgeKj"
+        class="sc-fznyAO hJHVee"
         data-testid="TransactionDetail"
       >
         <div
@@ -3030,7 +2718,7 @@ exports[`SendTransfer should render form and use location state 1`] = `
   >
     <nav
       aria-labelledby="main menu"
-      class="sc-fznJRM jfPUjT"
+      class="sc-fzoiQi bBgYbl"
     >
       <div
         class="px-4 sm:px-6 lg:px-10"
@@ -3042,7 +2730,7 @@ exports[`SendTransfer should render form and use location state 1`] = `
             class="flex items-center my-auto"
           >
             <div
-              class="sc-fznWqX jXdzJo"
+              class="sc-fzqARJ ktgHVM"
             >
               <svg
                 width="48"
@@ -3102,29 +2790,38 @@ exports[`SendTransfer should render form and use location state 1`] = `
           <div
             class="flex items-center my-auto space-x-4"
           >
-            <div
-              class="relative"
-              data-testid="dropdown__toggle"
-            >
+            <div>
               <div
-                class="overflow-hidden rounded-lg"
+                class="relative"
+                data-testid="dropdown__toggle"
               >
-                <button
-                  class="sc-AxjAm goVygI text-theme-primary-300 hover:text-theme-primary-700 hover:bg-theme-primary-50"
-                  color="primary"
-                  data-testid="navbar__buttons--notifications"
-                  type="button"
+                <div
+                  class="overflow-hidden rounded-lg"
                 >
-                  <div
-                    class="sc-AxiKw fFXzuz p-1"
-                    height="22"
-                    width="22"
+                  <button
+                    class="sc-AxjAm goVygI text-theme-primary-300 hover:text-theme-primary-700 hover:bg-theme-primary-50"
+                    color="primary"
+                    data-testid="navbar__buttons--notifications"
+                    type="button"
                   >
-                    <svg>
-                      notification.svg
-                    </svg>
-                  </div>
-                </button>
+                    <div
+                      class="sc-AxiKw fFXzuz p-1"
+                      height="22"
+                      width="22"
+                    >
+                      <svg>
+                        notification.svg
+                      </svg>
+                    </div>
+                    <div
+                      class="absolute right-0 flex items-center justify-center w-3 h-3 mr-3 -mt-3 bg-white border-white rounded-full"
+                    >
+                      <div
+                        class="w-2 h-2 rounded-full bg-theme-danger-500"
+                      />
+                    </div>
+                  </button>
+                </div>
               </div>
             </div>
             <div
@@ -3302,19 +2999,19 @@ exports[`SendTransfer should render form and use location state 1`] = `
           >
             <div>
               <ul
-                class="sc-fzqARJ kCbUYb"
+                class="sc-fzoyTs cPoNle"
               >
                 <li
-                  class="sc-fzoiQi gZjCeK"
+                  class="sc-fzqNqU jDKVmr"
                 />
                 <li
-                  class="sc-fzoiQi kdGDDv"
+                  class="sc-fzqNqU iyMmQK"
                 />
                 <li
-                  class="sc-fzoiQi kdGDDv"
+                  class="sc-fzqNqU iyMmQK"
                 />
                 <li
-                  class="sc-fzoiQi kdGDDv"
+                  class="sc-fzqNqU iyMmQK"
                 />
               </ul>
               <div
@@ -3375,11 +3072,11 @@ exports[`SendTransfer should render form and use location state 1`] = `
                                 id="SendTransactionForm__network-label"
                               />
                               <div
-                                class="sc-fzoLag hoOQgq"
+                                class="sc-fzpjYC dHxzen"
                                 data-testid="SelectNetworkInput"
                               >
                                 <div
-                                  class="sc-fzqBZW sc-fzqNJr gNHBIw px-4"
+                                  class="sc-fzoyAV sc-fzoLag grqxuS px-4"
                                 >
                                   <div
                                     aria-label="ARK Devnet"
@@ -3399,7 +3096,7 @@ exports[`SendTransfer should render form and use location state 1`] = `
                                   </div>
                                 </div>
                                 <span
-                                  class="sc-fzqBZW iEnjyC py-3 font-normal border border-transparent opacity-50 pointer-events-none pl-15"
+                                  class="sc-fzoyAV gCfUUB py-3 font-normal border border-transparent opacity-50 pointer-events-none pl-15"
                                   data-testid="SelectNetworkInput__typeahead"
                                 >
                                   ARK Devnet
@@ -3409,7 +3106,7 @@ exports[`SendTransfer should render form and use location state 1`] = `
                                   aria-controls="SendTransactionForm__network-menu"
                                   aria-labelledby="SendTransactionForm__network-label"
                                   autocomplete="off"
-                                  class="sc-fzokOt iLiRks overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 pl-15"
+                                  class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 pl-15"
                                   data-testid="SelectNetworkInput__input"
                                   disabled=""
                                   id="SendTransactionForm__network-input"
@@ -3492,7 +3189,7 @@ exports[`SendTransfer should render form and use location state 1`] = `
                                 </div>
                               </button>
                               <input
-                                class="sc-fzokOt iLiRks overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 hidden"
+                                class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 hidden"
                                 data-testid="SelectAddress__input"
                                 name="senderAddress"
                                 readonly=""
@@ -3547,7 +3244,7 @@ exports[`SendTransfer should render form and use location state 1`] = `
                                   Single
                                 </button>
                                 <button
-                                  class="sc-AxjAm fPpool flex-1 border-l-0"
+                                  class="sc-AxjAm hXnHfM flex-1 border-l-0"
                                   color="primary"
                                   data-testid="add-recipient-is-multiple-toggle"
                                   type="button"
@@ -3593,7 +3290,7 @@ exports[`SendTransfer should render form and use location state 1`] = `
                                         />
                                       </div>
                                       <input
-                                        class="sc-fzokOt iLiRks overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 pl-14 pr-11"
+                                        class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 pl-14 pr-11"
                                         data-testid="SelectRecipient__input"
                                         name="recipientAddress"
                                         type="text"
@@ -3635,10 +3332,10 @@ exports[`SendTransfer should render form and use location state 1`] = `
                                     </label>
                                   </div>
                                   <div
-                                    class="sc-fzoLag hoOQgq"
+                                    class="sc-fzpjYC dHxzen"
                                   >
                                     <input
-                                      class="sc-fzokOt iLiRks overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 pr-20"
+                                      class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 pr-20"
                                       data-testid="add-recipient__amount-input"
                                       name="amount"
                                       placeholder="Amount"
@@ -3646,7 +3343,7 @@ exports[`SendTransfer should render form and use location state 1`] = `
                                       value="0"
                                     />
                                     <div
-                                      class="sc-fzqBZW sc-fzoyAV icrEyZ"
+                                      class="sc-fzoyAV sc-fzoXzr YtqIf"
                                     >
                                       <button
                                         class="h-12 pl-6 pr-3 mr-1 text-theme-primary focus:outline-none"
@@ -3665,35 +3362,26 @@ exports[`SendTransfer should render form and use location state 1`] = `
                         <fieldset
                           class="sc-AxirZ izhStr relative"
                         >
-                          <div
-                            class="mb-2"
+                          <label
+                            class="flex inline-block mb-2 text-sm font-semibold transition-colors duration-100 FormLabel text-theme-neutral-dark"
+                            data-testid="FormLabel"
+                            for="smartbridge"
                           >
-                            <label
-                              class="flex inline-block mb-2 text-sm font-semibold transition-colors duration-100 FormLabel text-theme-neutral-dark"
-                              data-testid="FormLabel"
-                              for="smartbridge"
-                            >
-                              Smartbridge
-                              <div
-                                class="w-1 h-1 mt-1 ml-1 rounded-full bg-theme-danger-400"
-                                data-testid="FormLabel__required"
-                              />
-                            </label>
-                          </div>
+                            Smartbridge
+                          </label>
                           <div
-                            class="sc-fzoLag hoOQgq"
+                            class="sc-fzpjYC dHxzen"
                           >
                             <input
-                              class="sc-fzokOt iLiRks overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 pr-24"
+                              class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 pr-24"
                               data-testid="Input__smartbridge"
-                              maxlength="255"
                               name="smartbridge"
                               placeholder=" "
                               type="text"
                               value="ARK"
                             />
                             <div
-                              class="sc-fzqBZW sc-fzoyAV icrEyZ px-2 text-sm pointer-events-none text-theme-neutral"
+                              class="sc-fzoyAV sc-fzoXzr YtqIf px-2 text-sm pointer-events-none text-theme-neutral"
                               data-testid="InputCounter__counter"
                             >
                               0/255
@@ -3722,10 +3410,10 @@ exports[`SendTransfer should render form and use location state 1`] = `
                               class="flex-1"
                             >
                               <div
-                                class="sc-fzoLag hoOQgq"
+                                class="sc-fzpjYC dHxzen"
                               >
                                 <input
-                                  class="sc-fzokOt iLiRks overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 "
+                                  class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 "
                                   data-testid="InputCurrency"
                                   name="fee"
                                   type="text"
@@ -3739,19 +3427,19 @@ exports[`SendTransfer should render form and use location state 1`] = `
                                     data-testid="Range"
                                   >
                                     <div
-                                      class="sc-fzoXzr dYWnKg"
+                                      class="sc-fznxsB iIkzuE"
                                       data-testid="Range__track"
                                       style="transform: scale(1); cursor: pointer;"
                                     >
                                       <div
-                                        class="sc-fzpjYC csTNzu"
+                                        class="sc-fznJRM csJQgR"
                                         data-testid="Range__track__filled"
                                       >
                                         <div
                                           aria-valuemax="6.63"
                                           aria-valuemin="0.00357"
                                           aria-valuenow="0.71538139"
-                                          class="sc-fznxsB fjEYYX"
+                                          class="sc-fznWqX dbpdEg"
                                           data-testid="Range__thumb"
                                           draggable="false"
                                           role="slider"
@@ -3809,7 +3497,7 @@ exports[`SendTransfer should render form and use location state 1`] = `
                   class="flex justify-end mt-10 space-x-3"
                 >
                   <button
-                    class="sc-AxjAm fPpool"
+                    class="sc-AxjAm hXnHfM"
                     color="primary"
                     data-testid="SendTransfer__button--back"
                     disabled=""

From e22d59f72357445536b90014c3ee05449c089618 Mon Sep 17 00:00:00 2001
From: brenopolanski <breno.polanski@gmail.com>
Date: Thu, 15 Oct 2020 15:18:13 -0300
Subject: [PATCH 11/13] test: update snapshots

---
 .../SelectDropdown/SelectDropdown.tsx         |   2 +-
 .../__snapshots__/CreateProfile.test.tsx.snap | 180 +++++++++---------
 .../LinkCollection.test.tsx.snap              |   2 +-
 .../SendEntityRegistration.test.tsx.snap      |   4 +-
 4 files changed, 94 insertions(+), 94 deletions(-)

diff --git a/src/app/components/SelectDropdown/SelectDropdown.tsx b/src/app/components/SelectDropdown/SelectDropdown.tsx
index 2bb93ef351..7fdf96eec8 100755
--- a/src/app/components/SelectDropdown/SelectDropdown.tsx
+++ b/src/app/components/SelectDropdown/SelectDropdown.tsx
@@ -141,7 +141,7 @@ const SelectDropdown = ({
 									{...getItemProps({
 										index,
 										item,
-										className: `select-list-option ${
+										className: `select-list-option cursor-default ${
 											item.label === inputValue || (!inputValue && highlightedIndex === index)
 												? "is-highlighted"
 												: ""
diff --git a/src/domains/profile/pages/CreateProfile/__snapshots__/CreateProfile.test.tsx.snap b/src/domains/profile/pages/CreateProfile/__snapshots__/CreateProfile.test.tsx.snap
index 7a87831f20..d426732341 100644
--- a/src/domains/profile/pages/CreateProfile/__snapshots__/CreateProfile.test.tsx.snap
+++ b/src/domains/profile/pages/CreateProfile/__snapshots__/CreateProfile.test.tsx.snap
@@ -289,7 +289,7 @@ exports[`CreateProfile should not create new profile if profile name exists 1`]
                           >
                             <li
                               aria-selected="true"
-                              class="select-list-option is-highlighted"
+                              class="select-list-option cursor-default is-highlighted"
                               data-testid="select-list__toggle-option-0"
                               id="downshift-35-item-0"
                               role="option"
@@ -302,7 +302,7 @@ exports[`CreateProfile should not create new profile if profile name exists 1`]
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-1"
                               id="downshift-35-item-1"
                               role="option"
@@ -315,7 +315,7 @@ exports[`CreateProfile should not create new profile if profile name exists 1`]
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-2"
                               id="downshift-35-item-2"
                               role="option"
@@ -328,7 +328,7 @@ exports[`CreateProfile should not create new profile if profile name exists 1`]
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-3"
                               id="downshift-35-item-3"
                               role="option"
@@ -341,7 +341,7 @@ exports[`CreateProfile should not create new profile if profile name exists 1`]
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-4"
                               id="downshift-35-item-4"
                               role="option"
@@ -354,7 +354,7 @@ exports[`CreateProfile should not create new profile if profile name exists 1`]
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-5"
                               id="downshift-35-item-5"
                               role="option"
@@ -367,7 +367,7 @@ exports[`CreateProfile should not create new profile if profile name exists 1`]
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-6"
                               id="downshift-35-item-6"
                               role="option"
@@ -380,7 +380,7 @@ exports[`CreateProfile should not create new profile if profile name exists 1`]
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-7"
                               id="downshift-35-item-7"
                               role="option"
@@ -393,7 +393,7 @@ exports[`CreateProfile should not create new profile if profile name exists 1`]
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-8"
                               id="downshift-35-item-8"
                               role="option"
@@ -406,7 +406,7 @@ exports[`CreateProfile should not create new profile if profile name exists 1`]
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-9"
                               id="downshift-35-item-9"
                               role="option"
@@ -419,7 +419,7 @@ exports[`CreateProfile should not create new profile if profile name exists 1`]
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-10"
                               id="downshift-35-item-10"
                               role="option"
@@ -432,7 +432,7 @@ exports[`CreateProfile should not create new profile if profile name exists 1`]
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-11"
                               id="downshift-35-item-11"
                               role="option"
@@ -445,7 +445,7 @@ exports[`CreateProfile should not create new profile if profile name exists 1`]
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-12"
                               id="downshift-35-item-12"
                               role="option"
@@ -458,7 +458,7 @@ exports[`CreateProfile should not create new profile if profile name exists 1`]
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-13"
                               id="downshift-35-item-13"
                               role="option"
@@ -471,7 +471,7 @@ exports[`CreateProfile should not create new profile if profile name exists 1`]
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-14"
                               id="downshift-35-item-14"
                               role="option"
@@ -484,7 +484,7 @@ exports[`CreateProfile should not create new profile if profile name exists 1`]
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-15"
                               id="downshift-35-item-15"
                               role="option"
@@ -497,7 +497,7 @@ exports[`CreateProfile should not create new profile if profile name exists 1`]
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-16"
                               id="downshift-35-item-16"
                               role="option"
@@ -510,7 +510,7 @@ exports[`CreateProfile should not create new profile if profile name exists 1`]
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-17"
                               id="downshift-35-item-17"
                               role="option"
@@ -913,7 +913,7 @@ exports[`CreateProfile should not upload avatar image 1`] = `
                           >
                             <li
                               aria-selected="true"
-                              class="select-list-option is-highlighted"
+                              class="select-list-option cursor-default is-highlighted"
                               data-testid="select-list__toggle-option-0"
                               id="downshift-111-item-0"
                               role="option"
@@ -926,7 +926,7 @@ exports[`CreateProfile should not upload avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-1"
                               id="downshift-111-item-1"
                               role="option"
@@ -939,7 +939,7 @@ exports[`CreateProfile should not upload avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-2"
                               id="downshift-111-item-2"
                               role="option"
@@ -952,7 +952,7 @@ exports[`CreateProfile should not upload avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-3"
                               id="downshift-111-item-3"
                               role="option"
@@ -965,7 +965,7 @@ exports[`CreateProfile should not upload avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-4"
                               id="downshift-111-item-4"
                               role="option"
@@ -978,7 +978,7 @@ exports[`CreateProfile should not upload avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-5"
                               id="downshift-111-item-5"
                               role="option"
@@ -991,7 +991,7 @@ exports[`CreateProfile should not upload avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-6"
                               id="downshift-111-item-6"
                               role="option"
@@ -1004,7 +1004,7 @@ exports[`CreateProfile should not upload avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-7"
                               id="downshift-111-item-7"
                               role="option"
@@ -1017,7 +1017,7 @@ exports[`CreateProfile should not upload avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-8"
                               id="downshift-111-item-8"
                               role="option"
@@ -1030,7 +1030,7 @@ exports[`CreateProfile should not upload avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-9"
                               id="downshift-111-item-9"
                               role="option"
@@ -1043,7 +1043,7 @@ exports[`CreateProfile should not upload avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-10"
                               id="downshift-111-item-10"
                               role="option"
@@ -1056,7 +1056,7 @@ exports[`CreateProfile should not upload avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-11"
                               id="downshift-111-item-11"
                               role="option"
@@ -1069,7 +1069,7 @@ exports[`CreateProfile should not upload avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-12"
                               id="downshift-111-item-12"
                               role="option"
@@ -1082,7 +1082,7 @@ exports[`CreateProfile should not upload avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-13"
                               id="downshift-111-item-13"
                               role="option"
@@ -1095,7 +1095,7 @@ exports[`CreateProfile should not upload avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-14"
                               id="downshift-111-item-14"
                               role="option"
@@ -1108,7 +1108,7 @@ exports[`CreateProfile should not upload avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-15"
                               id="downshift-111-item-15"
                               role="option"
@@ -1121,7 +1121,7 @@ exports[`CreateProfile should not upload avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-16"
                               id="downshift-111-item-16"
                               role="option"
@@ -1134,7 +1134,7 @@ exports[`CreateProfile should not upload avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-17"
                               id="downshift-111-item-17"
                               role="option"
@@ -1918,7 +1918,7 @@ exports[`CreateProfile should store profile 1`] = `
                           >
                             <li
                               aria-selected="true"
-                              class="select-list-option is-highlighted"
+                              class="select-list-option cursor-default is-highlighted"
                               data-testid="select-list__toggle-option-0"
                               id="downshift-5-item-0"
                               role="option"
@@ -1931,7 +1931,7 @@ exports[`CreateProfile should store profile 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-1"
                               id="downshift-5-item-1"
                               role="option"
@@ -1944,7 +1944,7 @@ exports[`CreateProfile should store profile 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-2"
                               id="downshift-5-item-2"
                               role="option"
@@ -1957,7 +1957,7 @@ exports[`CreateProfile should store profile 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-3"
                               id="downshift-5-item-3"
                               role="option"
@@ -1970,7 +1970,7 @@ exports[`CreateProfile should store profile 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-4"
                               id="downshift-5-item-4"
                               role="option"
@@ -1983,7 +1983,7 @@ exports[`CreateProfile should store profile 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-5"
                               id="downshift-5-item-5"
                               role="option"
@@ -1996,7 +1996,7 @@ exports[`CreateProfile should store profile 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-6"
                               id="downshift-5-item-6"
                               role="option"
@@ -2009,7 +2009,7 @@ exports[`CreateProfile should store profile 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-7"
                               id="downshift-5-item-7"
                               role="option"
@@ -2022,7 +2022,7 @@ exports[`CreateProfile should store profile 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-8"
                               id="downshift-5-item-8"
                               role="option"
@@ -2035,7 +2035,7 @@ exports[`CreateProfile should store profile 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-9"
                               id="downshift-5-item-9"
                               role="option"
@@ -2048,7 +2048,7 @@ exports[`CreateProfile should store profile 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-10"
                               id="downshift-5-item-10"
                               role="option"
@@ -2061,7 +2061,7 @@ exports[`CreateProfile should store profile 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-11"
                               id="downshift-5-item-11"
                               role="option"
@@ -2074,7 +2074,7 @@ exports[`CreateProfile should store profile 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-12"
                               id="downshift-5-item-12"
                               role="option"
@@ -2087,7 +2087,7 @@ exports[`CreateProfile should store profile 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-13"
                               id="downshift-5-item-13"
                               role="option"
@@ -2100,7 +2100,7 @@ exports[`CreateProfile should store profile 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-14"
                               id="downshift-5-item-14"
                               role="option"
@@ -2113,7 +2113,7 @@ exports[`CreateProfile should store profile 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-15"
                               id="downshift-5-item-15"
                               role="option"
@@ -2126,7 +2126,7 @@ exports[`CreateProfile should store profile 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-16"
                               id="downshift-5-item-16"
                               role="option"
@@ -2139,7 +2139,7 @@ exports[`CreateProfile should store profile 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-17"
                               id="downshift-5-item-17"
                               role="option"
@@ -2542,7 +2542,7 @@ exports[`CreateProfile should store profile with password 1`] = `
                           >
                             <li
                               aria-selected="true"
-                              class="select-list-option is-highlighted"
+                              class="select-list-option cursor-default is-highlighted"
                               data-testid="select-list__toggle-option-0"
                               id="downshift-67-item-0"
                               role="option"
@@ -2555,7 +2555,7 @@ exports[`CreateProfile should store profile with password 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-1"
                               id="downshift-67-item-1"
                               role="option"
@@ -2568,7 +2568,7 @@ exports[`CreateProfile should store profile with password 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-2"
                               id="downshift-67-item-2"
                               role="option"
@@ -2581,7 +2581,7 @@ exports[`CreateProfile should store profile with password 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-3"
                               id="downshift-67-item-3"
                               role="option"
@@ -2594,7 +2594,7 @@ exports[`CreateProfile should store profile with password 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-4"
                               id="downshift-67-item-4"
                               role="option"
@@ -2607,7 +2607,7 @@ exports[`CreateProfile should store profile with password 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-5"
                               id="downshift-67-item-5"
                               role="option"
@@ -2620,7 +2620,7 @@ exports[`CreateProfile should store profile with password 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-6"
                               id="downshift-67-item-6"
                               role="option"
@@ -2633,7 +2633,7 @@ exports[`CreateProfile should store profile with password 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-7"
                               id="downshift-67-item-7"
                               role="option"
@@ -2646,7 +2646,7 @@ exports[`CreateProfile should store profile with password 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-8"
                               id="downshift-67-item-8"
                               role="option"
@@ -2659,7 +2659,7 @@ exports[`CreateProfile should store profile with password 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-9"
                               id="downshift-67-item-9"
                               role="option"
@@ -2672,7 +2672,7 @@ exports[`CreateProfile should store profile with password 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-10"
                               id="downshift-67-item-10"
                               role="option"
@@ -2685,7 +2685,7 @@ exports[`CreateProfile should store profile with password 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-11"
                               id="downshift-67-item-11"
                               role="option"
@@ -2698,7 +2698,7 @@ exports[`CreateProfile should store profile with password 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-12"
                               id="downshift-67-item-12"
                               role="option"
@@ -2711,7 +2711,7 @@ exports[`CreateProfile should store profile with password 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-13"
                               id="downshift-67-item-13"
                               role="option"
@@ -2724,7 +2724,7 @@ exports[`CreateProfile should store profile with password 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-14"
                               id="downshift-67-item-14"
                               role="option"
@@ -2737,7 +2737,7 @@ exports[`CreateProfile should store profile with password 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-15"
                               id="downshift-67-item-15"
                               role="option"
@@ -2750,7 +2750,7 @@ exports[`CreateProfile should store profile with password 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-16"
                               id="downshift-67-item-16"
                               role="option"
@@ -2763,7 +2763,7 @@ exports[`CreateProfile should store profile with password 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-17"
                               id="downshift-67-item-17"
                               role="option"
@@ -3166,7 +3166,7 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
                           >
                             <li
                               aria-selected="true"
-                              class="select-list-option is-highlighted"
+                              class="select-list-option cursor-default is-highlighted"
                               data-testid="select-list__toggle-option-0"
                               id="downshift-87-item-0"
                               role="option"
@@ -3179,7 +3179,7 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-1"
                               id="downshift-87-item-1"
                               role="option"
@@ -3192,7 +3192,7 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-2"
                               id="downshift-87-item-2"
                               role="option"
@@ -3205,7 +3205,7 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-3"
                               id="downshift-87-item-3"
                               role="option"
@@ -3218,7 +3218,7 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-4"
                               id="downshift-87-item-4"
                               role="option"
@@ -3231,7 +3231,7 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-5"
                               id="downshift-87-item-5"
                               role="option"
@@ -3244,7 +3244,7 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-6"
                               id="downshift-87-item-6"
                               role="option"
@@ -3257,7 +3257,7 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-7"
                               id="downshift-87-item-7"
                               role="option"
@@ -3270,7 +3270,7 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-8"
                               id="downshift-87-item-8"
                               role="option"
@@ -3283,7 +3283,7 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-9"
                               id="downshift-87-item-9"
                               role="option"
@@ -3296,7 +3296,7 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-10"
                               id="downshift-87-item-10"
                               role="option"
@@ -3309,7 +3309,7 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-11"
                               id="downshift-87-item-11"
                               role="option"
@@ -3322,7 +3322,7 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-12"
                               id="downshift-87-item-12"
                               role="option"
@@ -3335,7 +3335,7 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-13"
                               id="downshift-87-item-13"
                               role="option"
@@ -3348,7 +3348,7 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-14"
                               id="downshift-87-item-14"
                               role="option"
@@ -3361,7 +3361,7 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-15"
                               id="downshift-87-item-15"
                               role="option"
@@ -3374,7 +3374,7 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-16"
                               id="downshift-87-item-16"
                               role="option"
@@ -3387,7 +3387,7 @@ exports[`CreateProfile should upload and remove avatar image 1`] = `
                             </li>
                             <li
                               aria-selected="false"
-                              class="select-list-option "
+                              class="select-list-option cursor-default "
                               data-testid="select-list__toggle-option-17"
                               id="downshift-87-item-17"
                               role="option"
diff --git a/src/domains/transaction/components/LinkCollection/__snapshots__/LinkCollection.test.tsx.snap b/src/domains/transaction/components/LinkCollection/__snapshots__/LinkCollection.test.tsx.snap
index e7071b7da4..eaae5f4b17 100644
--- a/src/domains/transaction/components/LinkCollection/__snapshots__/LinkCollection.test.tsx.snap
+++ b/src/domains/transaction/components/LinkCollection/__snapshots__/LinkCollection.test.tsx.snap
@@ -109,7 +109,7 @@ exports[`LinkCollection should add links 1`] = `
                 >
                   <li
                     aria-selected="true"
-                    class="select-list-option is-highlighted"
+                    class="select-list-option cursor-default is-highlighted"
                     data-testid="select-list__toggle-option-0"
                     id="downshift-5-item-0"
                     role="option"
diff --git a/src/domains/transaction/pages/SendEntityRegistration/__snapshots__/SendEntityRegistration.test.tsx.snap b/src/domains/transaction/pages/SendEntityRegistration/__snapshots__/SendEntityRegistration.test.tsx.snap
index c73eeb1f42..2713203439 100644
--- a/src/domains/transaction/pages/SendEntityRegistration/__snapshots__/SendEntityRegistration.test.tsx.snap
+++ b/src/domains/transaction/pages/SendEntityRegistration/__snapshots__/SendEntityRegistration.test.tsx.snap
@@ -2536,7 +2536,7 @@ exports[`Registration should not set fee if no fee options 1`] = `
             >
               <li
                 aria-selected="true"
-                class="select-list-option is-highlighted"
+                class="select-list-option cursor-default is-highlighted"
                 data-testid="select-list__toggle-option-0"
                 id="downshift-33-item-0"
                 role="option"
@@ -3351,7 +3351,7 @@ exports[`Registration should render 1st step 1`] = `
             >
               <li
                 aria-selected="true"
-                class="select-list-option is-highlighted"
+                class="select-list-option cursor-default is-highlighted"
                 data-testid="select-list__toggle-option-0"
                 id="downshift-21-item-0"
                 role="option"

From 0bcb13897198ad7e35cabca57fcd31cadc1ce6f4 Mon Sep 17 00:00:00 2001
From: brenopolanski <breno.polanski@gmail.com>
Date: Thu, 15 Oct 2020 18:26:00 -0300
Subject: [PATCH 12/13] test: fix SendEntityRegistration tests

---
 .../SendEntityRegistration.test.tsx           | 13 +++---
 .../SendEntityRegistration.test.tsx.snap      | 44 ++++++++++++++-----
 2 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/src/domains/transaction/pages/SendEntityRegistration/SendEntityRegistration.test.tsx b/src/domains/transaction/pages/SendEntityRegistration/SendEntityRegistration.test.tsx
index 7df4516581..28b323c083 100644
--- a/src/domains/transaction/pages/SendEntityRegistration/SendEntityRegistration.test.tsx
+++ b/src/domains/transaction/pages/SendEntityRegistration/SendEntityRegistration.test.tsx
@@ -276,11 +276,11 @@ describe("Registration", () => {
 		expect(typeSelectInput).not.toHaveValue("delegateRegistration");
 
 		await act(async () => {
-			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Delegate" } });
+			fireEvent.focus(getByTestId("SelectDropdownInput__input"));
 
-			await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
+			await waitFor(() => expect(getByTestId("select-list__toggle-option-1")).toBeTruthy());
 
-			fireEvent.click(getByTestId("select-list__toggle-option-0"));
+			fireEvent.click(getByTestId("select-list__toggle-option-1"));
 
 			await waitFor(() => expect(getByTestId("Registration__continue-button")).not.toHaveAttribute("disabled"));
 
@@ -317,12 +317,13 @@ describe("Registration", () => {
 	});
 
 	it("should not have delegate option if wallet is a delegate", async () => {
-		const { asFragment, getByTestId } = await renderPage(secondWallet);
+		const { asFragment, getByTestId, queryByText } = await renderPage(secondWallet);
 
 		await act(async () => {
-			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Delegate" } });
+			fireEvent.focus(getByTestId("SelectDropdownInput__input"));
 		});
-		await waitFor(() => expect(getByTestId("select-list__input")).toHaveValue(""));
+		await waitFor(() => expect(queryByText("Business")).toBeInTheDocument());
+		await waitFor(() => expect(queryByText("Delegate")).not.toBeInTheDocument());
 		expect(asFragment()).toMatchSnapshot();
 	});
 
diff --git a/src/domains/transaction/pages/SendEntityRegistration/__snapshots__/SendEntityRegistration.test.tsx.snap b/src/domains/transaction/pages/SendEntityRegistration/__snapshots__/SendEntityRegistration.test.tsx.snap
index 2713203439..aa58f59b66 100644
--- a/src/domains/transaction/pages/SendEntityRegistration/__snapshots__/SendEntityRegistration.test.tsx.snap
+++ b/src/domains/transaction/pages/SendEntityRegistration/__snapshots__/SendEntityRegistration.test.tsx.snap
@@ -2255,12 +2255,12 @@ exports[`Registration should not have delegate option if wallet is a delegate 1`
                           <div
                             aria-expanded="true"
                             aria-haspopup="listbox"
-                            aria-owns="downshift-79-menu"
+                            aria-owns="downshift-77-menu"
                             role="combobox"
                           >
                             <label
-                              for="downshift-78-input"
-                              id="downshift-79-label"
+                              for="downshift-76-input"
+                              id="downshift-77-label"
                             />
                             <div
                               class="sc-fzpjYC dHxzen"
@@ -2268,28 +2268,48 @@ exports[`Registration should not have delegate option if wallet is a delegate 1`
                             >
                               <input
                                 aria-autocomplete="list"
-                                aria-controls="downshift-79-menu"
-                                aria-labelledby="downshift-79-label"
+                                aria-controls="downshift-77-menu"
+                                aria-labelledby="downshift-77-label"
                                 autocomplete="off"
                                 class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
                                 data-testid="SelectDropdownInput__input"
-                                id="downshift-78-input"
+                                id="downshift-76-input"
                                 name="registrationType"
                                 placeholder="Select option"
-                                value="Delegate"
+                                value=""
                               />
                             </div>
                             <ul
-                              aria-labelledby="downshift-79-label"
+                              aria-labelledby="downshift-77-label"
                               class="sc-fznxKY erNwxN is-open"
-                              id="downshift-79-menu"
+                              id="downshift-77-menu"
                               role="listbox"
                             >
                               <li
-                                class="select-list-option is-empty"
-                                data-testid="select-list__empty-option"
+                                aria-selected="false"
+                                class="select-list-option cursor-default "
+                                data-testid="select-list__toggle-option-0"
+                                id="downshift-77-item-0"
+                                role="option"
+                              >
+                                <div
+                                  class="select-list-option__label"
+                                >
+                                  Business
+                                </div>
+                              </li>
+                              <li
+                                aria-selected="false"
+                                class="select-list-option cursor-default "
+                                data-testid="select-list__toggle-option-1"
+                                id="downshift-77-item-1"
+                                role="option"
                               >
-                                No options
+                                <div
+                                  class="select-list-option__label"
+                                >
+                                  MultiSignature
+                                </div>
                               </li>
                             </ul>
                           </div>

From 0832cbf84a35fb4375389417ac19bb4d16b1e620 Mon Sep 17 00:00:00 2001
From: brenopolanski <breno.polanski@gmail.com>
Date: Thu, 15 Oct 2020 19:02:47 -0300
Subject: [PATCH 13/13] wip

---
 .../SendEntityRegistration.test.tsx           |  52 ++++-----
 .../SendEntityRegistration.test.tsx.snap      | 100 +++++++++++++-----
 2 files changed, 102 insertions(+), 50 deletions(-)

diff --git a/src/domains/transaction/pages/SendEntityRegistration/SendEntityRegistration.test.tsx b/src/domains/transaction/pages/SendEntityRegistration/SendEntityRegistration.test.tsx
index 28b323c083..439221e5ba 100644
--- a/src/domains/transaction/pages/SendEntityRegistration/SendEntityRegistration.test.tsx
+++ b/src/domains/transaction/pages/SendEntityRegistration/SendEntityRegistration.test.tsx
@@ -200,11 +200,11 @@ describe("Registration", () => {
 		const { asFragment, getByTestId } = rendered!;
 
 		await renderHookAct(async () => {
-			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Delegate" } });
+			fireEvent.focus(getByTestId("SelectDropdownInput__input"));
 
-			await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
+			await waitFor(() => expect(getByTestId("select-list__toggle-option-1")).toBeTruthy());
 
-			fireEvent.click(getByTestId("select-list__toggle-option-0"));
+			fireEvent.click(getByTestId("select-list__toggle-option-1"));
 
 			await waitFor(() =>
 				expect(setValueSpy).toHaveBeenNthCalledWith(
@@ -249,11 +249,11 @@ describe("Registration", () => {
 		const { asFragment, getByTestId } = rendered!;
 
 		await renderHookAct(async () => {
-			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Delegate" } });
+			fireEvent.focus(getByTestId("SelectDropdownInput__input"));
 
-			await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
+			await waitFor(() => expect(getByTestId("select-list__toggle-option-1")).toBeTruthy());
 
-			fireEvent.click(getByTestId("select-list__toggle-option-0"));
+			fireEvent.click(getByTestId("select-list__toggle-option-1"));
 
 			await waitFor(() =>
 				expect(setValueSpy).toHaveBeenNthCalledWith(
@@ -334,11 +334,11 @@ describe("Registration", () => {
 		expect(typeSelectInput).not.toHaveValue("delegateRegistration");
 
 		await act(async () => {
-			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Delegate" } });
+			fireEvent.focus(getByTestId("SelectDropdownInput__input"));
 
-			await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
+			await waitFor(() => expect(getByTestId("select-list__toggle-option-1")).toBeTruthy());
 
-			fireEvent.click(getByTestId("select-list__toggle-option-0"));
+			fireEvent.click(getByTestId("select-list__toggle-option-1"));
 
 			await waitFor(() => expect(getByTestId("Registration__continue-button")).not.toHaveAttribute("disabled"));
 
@@ -377,11 +377,11 @@ describe("Registration", () => {
 		expect(typeSelectInput).not.toHaveValue("delegateRegistration");
 
 		await act(async () => {
-			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Delegate" } });
+			fireEvent.focus(getByTestId("SelectDropdownInput__input"));
 
-			await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
+			await waitFor(() => expect(getByTestId("select-list__toggle-option-1")).toBeTruthy());
 
-			fireEvent.click(getByTestId("select-list__toggle-option-0"));
+			fireEvent.click(getByTestId("select-list__toggle-option-1"));
 
 			await waitFor(() => expect(getByTestId("Registration__continue-button")).not.toHaveAttribute("disabled"));
 
@@ -425,10 +425,10 @@ describe("Registration", () => {
 
 		await act(async () => {
 			// Step 1
-			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Delegate" } });
-			await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
+			fireEvent.focus(getByTestId("SelectDropdownInput__input"));
+			await waitFor(() => expect(getByTestId("select-list__toggle-option-1")).toBeTruthy());
 
-			fireEvent.click(getByTestId("select-list__toggle-option-0"));
+			fireEvent.click(getByTestId("select-list__toggle-option-1"));
 			await waitFor(() => expect(getByTestId("Registration__continue-button")).not.toHaveAttribute("disabled"));
 
 			// Step 2
@@ -521,10 +521,10 @@ describe("Registration", () => {
 
 		await act(async () => {
 			// Step 1
-			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Delegate" } });
-			await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
+			fireEvent.focus(getByTestId("SelectDropdownInput__input"));
+			await waitFor(() => expect(getByTestId("select-list__toggle-option-1")).toBeTruthy());
 
-			fireEvent.click(getByTestId("select-list__toggle-option-0"));
+			fireEvent.click(getByTestId("select-list__toggle-option-1"));
 			await waitFor(() => expect(getByTestId("Registration__continue-button")).not.toHaveAttribute("disabled"));
 
 			// Step 2
@@ -579,7 +579,7 @@ describe("Registration", () => {
 		const { asFragment, getByTestId } = await renderPage(wallet);
 
 		act(() => {
-			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Business" } });
+			fireEvent.focus(getByTestId("SelectDropdownInput__input"));
 		});
 
 		await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
@@ -609,7 +609,7 @@ describe("Registration", () => {
 		const { getByTestId, getAllByTestId } = await renderPage(wallet);
 
 		act(() => {
-			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Business" } });
+			fireEvent.focus(getByTestId("SelectDropdownInput__input"));
 		});
 
 		await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
@@ -638,7 +638,7 @@ describe("Registration", () => {
 		const { asFragment, getByTestId } = await renderPage(wallet);
 
 		act(() => {
-			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Business" } });
+			fireEvent.focus(getByTestId("SelectDropdownInput__input"));
 		});
 
 		await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
@@ -668,7 +668,7 @@ describe("Registration", () => {
 		const { asFragment, getByTestId } = await renderPage(wallet);
 
 		act(() => {
-			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Business" } });
+			fireEvent.focus(getByTestId("SelectDropdownInput__input"));
 		});
 
 		await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
@@ -700,7 +700,7 @@ describe("Registration", () => {
 		const { asFragment, getByTestId } = await renderPage(wallet);
 
 		act(() => {
-			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Business" } });
+			fireEvent.focus(getByTestId("SelectDropdownInput__input"));
 		});
 
 		await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
@@ -730,7 +730,7 @@ describe("Registration", () => {
 		const { asFragment, getByTestId } = await renderPage(wallet);
 
 		act(() => {
-			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Business" } });
+			fireEvent.focus(getByTestId("SelectDropdownInput__input"));
 		});
 
 		await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
@@ -803,7 +803,7 @@ describe("Registration", () => {
 		const { asFragment, getByTestId, getAllByTestId } = await renderPage(wallet);
 
 		act(() => {
-			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Business" } });
+			fireEvent.focus(getByTestId("SelectDropdownInput__input"));
 		});
 
 		await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
@@ -960,7 +960,7 @@ describe("Registration", () => {
 		await waitFor(() => expect(queryAllByTestId("Registration__type")).toHaveLength(1));
 
 		act(() => {
-			fireEvent.change(getByTestId("SelectDropdownInput__input"), { target: { value: "Business" } });
+			fireEvent.focus(getByTestId("SelectDropdownInput__input"));
 		});
 
 		await waitFor(() => expect(getByTestId("select-list__toggle-option-0")).toBeTruthy());
diff --git a/src/domains/transaction/pages/SendEntityRegistration/__snapshots__/SendEntityRegistration.test.tsx.snap b/src/domains/transaction/pages/SendEntityRegistration/__snapshots__/SendEntityRegistration.test.tsx.snap
index aa58f59b66..bf9ca66436 100644
--- a/src/domains/transaction/pages/SendEntityRegistration/__snapshots__/SendEntityRegistration.test.tsx.snap
+++ b/src/domains/transaction/pages/SendEntityRegistration/__snapshots__/SendEntityRegistration.test.tsx.snap
@@ -2255,12 +2255,12 @@ exports[`Registration should not have delegate option if wallet is a delegate 1`
                           <div
                             aria-expanded="true"
                             aria-haspopup="listbox"
-                            aria-owns="downshift-77-menu"
+                            aria-owns="downshift-73-menu"
                             role="combobox"
                           >
                             <label
-                              for="downshift-76-input"
-                              id="downshift-77-label"
+                              for="downshift-72-input"
+                              id="downshift-73-label"
                             />
                             <div
                               class="sc-fzpjYC dHxzen"
@@ -2268,28 +2268,28 @@ exports[`Registration should not have delegate option if wallet is a delegate 1`
                             >
                               <input
                                 aria-autocomplete="list"
-                                aria-controls="downshift-77-menu"
-                                aria-labelledby="downshift-77-label"
+                                aria-controls="downshift-73-menu"
+                                aria-labelledby="downshift-73-label"
                                 autocomplete="off"
                                 class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
                                 data-testid="SelectDropdownInput__input"
-                                id="downshift-76-input"
+                                id="downshift-72-input"
                                 name="registrationType"
                                 placeholder="Select option"
                                 value=""
                               />
                             </div>
                             <ul
-                              aria-labelledby="downshift-77-label"
+                              aria-labelledby="downshift-73-label"
                               class="sc-fznxKY erNwxN is-open"
-                              id="downshift-77-menu"
+                              id="downshift-73-menu"
                               role="listbox"
                             >
                               <li
                                 aria-selected="false"
                                 class="select-list-option cursor-default "
                                 data-testid="select-list__toggle-option-0"
-                                id="downshift-77-item-0"
+                                id="downshift-73-item-0"
                                 role="option"
                               >
                                 <div
@@ -2302,7 +2302,7 @@ exports[`Registration should not have delegate option if wallet is a delegate 1`
                                 aria-selected="false"
                                 class="select-list-option cursor-default "
                                 data-testid="select-list__toggle-option-1"
-                                id="downshift-77-item-1"
+                                id="downshift-73-item-1"
                                 role="option"
                               >
                                 <div
@@ -2517,12 +2517,12 @@ exports[`Registration should not set fee if no fee options 1`] = `
           <div
             aria-expanded="true"
             aria-haspopup="listbox"
-            aria-owns="downshift-33-menu"
+            aria-owns="downshift-31-menu"
             role="combobox"
           >
             <label
-              for="downshift-32-input"
-              id="downshift-33-label"
+              for="downshift-30-input"
+              id="downshift-31-label"
             />
             <div
               class="sc-fzpjYC dHxzen"
@@ -2535,30 +2535,43 @@ exports[`Registration should not set fee if no fee options 1`] = `
                 Delegate
               </span>
               <input
-                aria-activedescendant="downshift-33-item-0"
+                aria-activedescendant="downshift-31-item-1"
                 aria-autocomplete="list"
-                aria-controls="downshift-33-menu"
-                aria-labelledby="downshift-33-label"
+                aria-controls="downshift-31-menu"
+                aria-labelledby="downshift-31-label"
                 autocomplete="off"
                 class="sc-fzqNJr kdQsaY overflow-hidden w-full bg-theme-background appearance-none rounded border border-theme-neutral-300 text-theme-neutral-900 transition-colors duration-200 px-4 py-3 cursor-default"
                 data-testid="SelectDropdownInput__input"
-                id="downshift-32-input"
+                id="downshift-30-input"
                 name="registrationType"
                 placeholder="Select option"
                 value="Delegate"
               />
             </div>
             <ul
-              aria-labelledby="downshift-33-label"
+              aria-labelledby="downshift-31-label"
               class="sc-fznxKY erNwxN is-open"
-              id="downshift-33-menu"
+              id="downshift-31-menu"
               role="listbox"
             >
+              <li
+                aria-selected="false"
+                class="select-list-option cursor-default "
+                data-testid="select-list__toggle-option-0"
+                id="downshift-31-item-0"
+                role="option"
+              >
+                <div
+                  class="select-list-option__label"
+                >
+                  Business
+                </div>
+              </li>
               <li
                 aria-selected="true"
                 class="select-list-option cursor-default is-highlighted"
-                data-testid="select-list__toggle-option-0"
-                id="downshift-33-item-0"
+                data-testid="select-list__toggle-option-1"
+                id="downshift-31-item-1"
                 role="option"
               >
                 <div
@@ -2567,6 +2580,19 @@ exports[`Registration should not set fee if no fee options 1`] = `
                   Delegate
                 </div>
               </li>
+              <li
+                aria-selected="false"
+                class="select-list-option cursor-default "
+                data-testid="select-list__toggle-option-2"
+                id="downshift-31-item-2"
+                role="option"
+              >
+                <div
+                  class="select-list-option__label"
+                >
+                  Second Signature
+                </div>
+              </li>
             </ul>
           </div>
           <div
@@ -3350,7 +3376,7 @@ exports[`Registration should render 1st step 1`] = `
                 Delegate
               </span>
               <input
-                aria-activedescendant="downshift-21-item-0"
+                aria-activedescendant="downshift-21-item-1"
                 aria-autocomplete="list"
                 aria-controls="downshift-21-menu"
                 aria-labelledby="downshift-21-label"
@@ -3370,11 +3396,24 @@ exports[`Registration should render 1st step 1`] = `
               role="listbox"
             >
               <li
-                aria-selected="true"
-                class="select-list-option cursor-default is-highlighted"
+                aria-selected="false"
+                class="select-list-option cursor-default "
                 data-testid="select-list__toggle-option-0"
                 id="downshift-21-item-0"
                 role="option"
+              >
+                <div
+                  class="select-list-option__label"
+                >
+                  Business
+                </div>
+              </li>
+              <li
+                aria-selected="true"
+                class="select-list-option cursor-default is-highlighted"
+                data-testid="select-list__toggle-option-1"
+                id="downshift-21-item-1"
+                role="option"
               >
                 <div
                   class="select-list-option__label"
@@ -3382,6 +3421,19 @@ exports[`Registration should render 1st step 1`] = `
                   Delegate
                 </div>
               </li>
+              <li
+                aria-selected="false"
+                class="select-list-option cursor-default "
+                data-testid="select-list__toggle-option-2"
+                id="downshift-21-item-2"
+                role="option"
+              >
+                <div
+                  class="select-list-option__label"
+                >
+                  Second Signature
+                </div>
+              </li>
             </ul>
           </div>
           <div