diff --git a/src/react-components/ory/helpers/error-messages.tsx b/src/react-components/ory/helpers/error-messages.tsx index 3308cbdd3..c8a0ce8a9 100644 --- a/src/react-components/ory/helpers/error-messages.tsx +++ b/src/react-components/ory/helpers/error-messages.tsx @@ -15,7 +15,7 @@ const nodeMessage = ({ }: { text: string id: number - key: number + key: string }) => ( {text} @@ -29,7 +29,9 @@ export const NodeMessages = ({ const $groupMessages = nodes?.reduce( (groups, { messages }) => { groups = groups.concat( - messages.map(({ text, id }) => nodeMessage({ text, id, key: id })), + messages.map(({ text, id }, key) => + nodeMessage({ text, id, key: `node-group-message-${id}-${key}` }), + ), ) return groups }, @@ -37,16 +39,12 @@ export const NodeMessages = ({ ) const $messages = uiMessages?.map(({ text, id }, key) => - nodeMessage({ text, id, key }), + nodeMessage({ text, id, key: `ui-messsage-${id}-${key}` }), ) - console.dir({ $groupMessages, $messages }) + const $allMessages = [...($groupMessages || []), ...($messages || [])] - return ($messages && $messages.length > 0) || - ($groupMessages && $groupMessages.length > 0) ? ( -
- {$messages} - {$groupMessages} -
+ return $allMessages.length > 0 ? ( +
{$allMessages}
) : null } diff --git a/src/react-components/ory/helpers/node.tsx b/src/react-components/ory/helpers/node.tsx index 6ea90053c..ad175c185 100644 --- a/src/react-components/ory/helpers/node.tsx +++ b/src/react-components/ory/helpers/node.tsx @@ -155,7 +155,7 @@ export const Node = ({ required={attrs.required} defaultValue={attrs.value} disabled={attrs.disabled} - checked={Boolean(attrs.value)} + defaultChecked={Boolean(attrs.value)} /> ) default: diff --git a/src/react-components/ory/user-auth-card.tsx b/src/react-components/ory/user-auth-card.tsx index ee4b9c743..e317b6e2a 100644 --- a/src/react-components/ory/user-auth-card.tsx +++ b/src/react-components/ory/user-auth-card.tsx @@ -169,15 +169,17 @@ export const UserAuthCard = ({ ), ] .filter(Boolean) // remove nulls - .map((flow, index) => - index > 0 ? ( - <> - {flow} - - ) : ( - flow - ), - ) // only map the divider if the index is greater than 0 - more than one flow + .map((flow, index) => ( +
+ {index > 0 ? ( + <> + {flow} + + ) : ( + flow + )} +
+ )) // only map the divider if the index is greater than 0 - more than one flow switch (flowType) { case "login":