Skip to content

Commit f3d4dcb

Browse files
committed
Fix text for install netbird modal
1 parent 57e71a3 commit f3d4dcb

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

src/modules/setup-keys/SetupKeyModal.tsx

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,14 @@ type Props = {
4141
children?: React.ReactNode;
4242
open: boolean;
4343
setOpen: (open: boolean) => void;
44+
name?: string;
4445
};
4546
const copyMessage = "Setup-Key was copied to your clipboard!";
4647
export default function SetupKeyModal({
4748
children,
4849
open,
4950
setOpen,
51+
name,
5052
}: Readonly<Props>) {
5153
const [successModal, setSuccessModal] = useState(false);
5254
const [setupKey, setSetupKey] = useState<SetupKey>();
@@ -62,13 +64,16 @@ export default function SetupKeyModal({
6264
<>
6365
<Modal open={open} onOpenChange={setOpen} key={open ? 1 : 0}>
6466
{children && <ModalTrigger asChild>{children}</ModalTrigger>}
65-
<SetupKeyModalContent onSuccess={handleSuccess} />
67+
<SetupKeyModalContent onSuccess={handleSuccess} predefinedName={name} />
6668
</Modal>
6769

6870
<Modal
6971
open={installModal}
70-
onOpenChange={setInstallModal}
71-
key={installModal ? 1 : 0}
72+
onOpenChange={(state) => {
73+
setInstallModal(state);
74+
setOpen(false);
75+
}}
76+
key={installModal ? 2 : 3}
7277
>
7378
<SetupModal showClose={true} setupKey={setupKey?.key} />
7479
</Modal>
@@ -144,13 +149,17 @@ export default function SetupKeyModal({
144149

145150
type ModalProps = {
146151
onSuccess?: (setupKey: SetupKey) => void;
152+
predefinedName?: string;
147153
};
148154

149-
export function SetupKeyModalContent({ onSuccess }: Readonly<ModalProps>) {
155+
export function SetupKeyModalContent({
156+
onSuccess,
157+
predefinedName = "",
158+
}: Readonly<ModalProps>) {
150159
const setupKeyRequest = useApiCall<SetupKey>("/setup-keys", true);
151160
const { mutate } = useSWRConfig();
152161

153-
const [name, setName] = useState("");
162+
const [name, setName] = useState(predefinedName);
154163
const [reusable, setReusable] = useState(false);
155164
const [usageLimit, setUsageLimit] = useState("");
156165
const [expiresIn, setExpiresIn] = useState("7");

src/modules/setup-netbird-modal/SetupModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export function SetupModalContent({
8383
{`It's time to add your first device.`}
8484
</>
8585
) : (
86-
<>Install NetBird with Setup Key</>
86+
<>Install NetBird{setupKey && " with Setup Key"}</>
8787
)}
8888
</h2>
8989
<Paragraph

0 commit comments

Comments
 (0)