-
+ <>
+
+
+
{!data && !isLoading && (
-
- {data && (
-
- If your mobile device does not have a camera capable of scanning QR
- codes, the following text code can be used:
-
- {data.otpkey.value_b32}
(
- navigator.clipboard.writeText(data.otpkey.value_b32)}
- >
- copy to clipboard
-
- )
-
- )}
{!data && isError && (
-
-
- There was an error generating your QR code. If this error persists,
- please{' '}
-
- submit a ticket
- {' '}
- and TACC User Services will assist you.
+
+ Unable to display QR code. If this error persists,{' '}
+ submit a ticket.
+
+ )}
+ {data && data.otpkey && (
+
+ Can't scan QR code?{' '}
+
+
+
-
+
+ )}
+ {data && !data.otpkey && (
+
+ Can't scan QR code?{' '}
+ Submit a ticket.
+
)}
-
+ >
);
};
diff --git a/libs/tup-components/src/mfa/MfaSmsPanel.tsx b/libs/tup-components/src/mfa/MfaSmsPanel.tsx
index b91a9cb56..9c1ad0a91 100644
--- a/libs/tup-components/src/mfa/MfaSmsPanel.tsx
+++ b/libs/tup-components/src/mfa/MfaSmsPanel.tsx
@@ -1,6 +1,6 @@
import React, { useState } from 'react';
import { useMfaPairSms } from '@tacc/tup-hooks';
-import { Button, SectionMessage } from '@tacc/core-components';
+import { Button, InlineMessage } from '@tacc/core-components';
import styles from './Mfa.module.css';
import { TicketCreateModal } from '../tickets';
@@ -12,39 +12,31 @@ const MfaSmsPanel: React.FC = () => {
smsMutation.mutate({ phoneNumber });
};
return (
-
-
1. Enter your phone number:
-
+
+ Send Token
+
+
);
};
diff --git a/libs/tup-components/src/mfa/MfaSuccessView.tsx b/libs/tup-components/src/mfa/MfaSuccessView.tsx
index a5fc67a8e..b72bedb91 100644
--- a/libs/tup-components/src/mfa/MfaSuccessView.tsx
+++ b/libs/tup-components/src/mfa/MfaSuccessView.tsx
@@ -10,11 +10,9 @@ const MfaSuccessView: React.FC = () => {
Pairing Successful
-
- navigate('/')}>
- Return to Dashboard
-
-
+ navigate('/')}>
+ Return to Dashboard
+
);
};
diff --git a/libs/tup-components/src/mfa/MfaValidationPanel.tsx b/libs/tup-components/src/mfa/MfaValidationPanel.tsx
index e8c0b720a..d9c6eea52 100644
--- a/libs/tup-components/src/mfa/MfaValidationPanel.tsx
+++ b/libs/tup-components/src/mfa/MfaValidationPanel.tsx
@@ -1,6 +1,7 @@
import React, { useState } from 'react';
import { useMfaVerify } from '@tacc/tup-hooks';
-import { Button, SectionMessage } from '@tacc/core-components';
+import { Button, InlineMessage } from '@tacc/core-components';
+import TicketCreateModal from '../tickets/TicketCreateModal';
import styles from './Mfa.module.css';
const MfaValidationPanel: React.FC<{ tokenType: 'totp' | 'sms' }> = ({
@@ -14,41 +15,40 @@ const MfaValidationPanel: React.FC<{ tokenType: 'totp' | 'sms' }> = ({
};
const pairingMessage = {
- totp: '2. Enter the token shown in the app to continue the pairing.',
- sms: '2. Enter the token sent to your phone number.',
+ totp: 'Enter the token shown in the app to continue the pairing.',
+ sms: 'Enter the token sent to your phone number.',
};
return (
-
- {pairingMessage[tokenType]}
-