diff --git a/apps/console/app/routes/apps/$clientId/team.tsx b/apps/console/app/routes/apps/$clientId/team.tsx index 57aef6a56c..c1a14d4325 100644 --- a/apps/console/app/routes/apps/$clientId/team.tsx +++ b/apps/console/app/routes/apps/$clientId/team.tsx @@ -227,20 +227,16 @@ export default () => { onSelect={(selected) => { // type casting to DropdownSelectListItem instead of array if (!Array.isArray(selected)) { - //TODO: Temp fix. To be removed with full fix of typing issue - //@ts-ignore - if (selected === appContactAddress) { + if (!selected || !selected.value) { + console.error('Error selecting email, try again') return } - if (!selected) { - console.error('No addressURN') + if (selected.value === appContactAddress) { return } submit( { - //TODO: temp fix. To be removed with full fix of typing issue - //@ts-ignore - addressURN: selected, + addressURN: selected.value, }, { method: 'post', diff --git a/apps/passport/app/routes/authorize.tsx b/apps/passport/app/routes/authorize.tsx index 357e88b571..eb8b37a5fc 100644 --- a/apps/passport/app/routes/authorize.tsx +++ b/apps/passport/app/routes/authorize.tsx @@ -444,7 +444,7 @@ export default function Authorize() { } if (requestedScope.includes('email') && selectedEmail) { - personaData.email = selectedEmail + personaData.email = selectedEmail.value } if ( @@ -455,6 +455,7 @@ export default function Authorize() { personaData.connected_accounts = AuthorizationControlSelection.ALL } else { personaData.connected_accounts = selectedConnectedAccounts + .map((account) => (account as DropdownSelectListItem).value) } } @@ -463,6 +464,7 @@ export default function Authorize() { personaData.erc_4337 = AuthorizationControlSelection.ALL } else { personaData.erc_4337 = selectedSCWallets + .map((wallet) => (wallet as DropdownSelectListItem).value) } } diff --git a/packages/design-system/src/atoms/dropdown/DropdownSelectList.tsx b/packages/design-system/src/atoms/dropdown/DropdownSelectList.tsx index bfcba1ee66..ecb143a5be 100644 --- a/packages/design-system/src/atoms/dropdown/DropdownSelectList.tsx +++ b/packages/design-system/src/atoms/dropdown/DropdownSelectList.tsx @@ -79,13 +79,11 @@ export const Dropdown = ({ if (multiple) { setSelectedItems(input as DropdownSelectListItem[]) if (!allItemsSelected) { - //@ts-ignore - onSelect(input.map((i) => i.value)) + onSelect(input) } } else { setSelectedItem(input as DropdownSelectListItem) - //@ts-ignore - onSelect(input.value) + onSelect(input) } }} multiple={multiple}