Skip to content

Commit e5ec6cc

Browse files
PR comments
1 parent 8e534f5 commit e5ec6cc

File tree

7 files changed

+15
-9
lines changed

7 files changed

+15
-9
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:14-alpine as build
1+
FROM node:20-alpine as build
22

33
WORKDIR /app
44
COPY package*.json /app/

dev.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:14-alpine
1+
FROM node:20-alpine
22

33
WORKDIR /app
44

pages/settings.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,7 @@ const Settings: NextPage = () => {
153153
</div>
154154
{!isOidc ?
155155
<div className="form-container">
156-
<h3 className="subtitle">Change password</h3>
157-
<Messages messages={changedFlow?.ui.messages} />
156+
<h3 className="subtitle">{flowId ? 'Set' : 'Change'} password</h3>
158157
<Flow
159158
hideGlobalMessages
160159
onSubmit={onSubmit}
@@ -166,7 +165,6 @@ const Settings: NextPage = () => {
166165
{containsBackupCodes ? (<div className="form-container">
167166
<h3 className="subtitle">Manage 2FA backup recovery codes</h3>
168167
<p>Recovery codes can be used in panic situations where you have lost access to your 2FA device.</p>
169-
<Messages messages={changedFlow?.ui.messages} />
170168
<Flow
171169
hideGlobalMessages
172170
onSubmit={onSubmit}
@@ -184,7 +182,6 @@ const Settings: NextPage = () => {
184182
href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2&hl=en&gl=US"
185183
target="_blank">Android</a>).
186184
</p>
187-
<Messages messages={changedFlow?.ui.messages} />
188185
<Flow
189186
hideGlobalMessages
190187
onSubmit={onSubmit}

pkg/ui/Messages.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { displayMessage } from "@/util/helper-functions"
12
import { UiText } from "@ory/client"
23
import { Alert, AlertContent } from "@ory/themes"
34

@@ -9,7 +10,7 @@ export const Message = ({ message }: MessageProps) => {
910
return (
1011
<Alert severity={message.type === "error" ? "error" : "info"}>
1112
<AlertContent data-testid={`ui/message/${message.id}`} className={message.type == 'error' ? 'message error' : 'message success'}>
12-
{message.text}
13+
{displayMessage(message)}
1314
</AlertContent>
1415
</Alert>
1516
)

util/helper-functions.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
const customMessageOverrides = {
2+
1060001: "Welcome to the app! You have successfully registered. Set your first, last name and password to continue.",
3+
};
4+
15
export function getValueIdentifier(selectedRole: any) {
26
let value = '';
37
if (selectedRole === 'engineer') {
@@ -58,4 +62,8 @@ export function prepareNodes(flow: any) {
5862
}
5963

6064
return filteredNodes;
65+
}
66+
67+
export function displayMessage(msg: any): string {
68+
return customMessageOverrides[msg.id] || msg.text;
6169
}

0 commit comments

Comments
 (0)