Fix error thrown in SmartSafetyNumberModal

Co-authored-by: Jamie Kyle <113370520+jamiebuilds-signal@users.noreply.github.com>
This commit is contained in:
automated-signal 2024-03-14 14:56:42 -05:00 committed by GitHub
parent 824002d766
commit cd93d8ebb6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 9 additions and 9 deletions

View file

@ -70,7 +70,7 @@ const createProps = (overrideProps: Partial<PropsType> = {}): PropsType => ({
i18n,
safetyNumber:
'safetyNumber' in overrideProps
? overrideProps.safetyNumber
? overrideProps.safetyNumber ?? null
: {
numberBlocks: generateNumberBlocks(),
qrData: generateQRData(),

View file

@ -17,9 +17,9 @@ export type PropsType = {
generateSafetyNumber: (contact: ConversationType) => void;
i18n: LocalizerType;
onClose: () => void;
safetyNumber?: SafetyNumberType;
safetyNumber: SafetyNumberType | null;
toggleVerified: (contact: ConversationType) => void;
verificationDisabled: boolean;
verificationDisabled: boolean | null;
};
export function SafetyNumberViewer({
@ -108,7 +108,7 @@ export function SafetyNumberViewer({
<div className="module-SafetyNumberViewer__button">
<Button
disabled={verificationDisabled}
disabled={verificationDisabled ?? false}
onClick={() => {
toggleVerified(contact);
}}

View file

@ -23,5 +23,5 @@ export const getContactSafetyNumber = createSelector(
(
{ contacts }: SafetyNumberStateType,
contactID: string
): SafetyNumberContactType => contacts[contactID]
): SafetyNumberContactType | void => contacts[contactID]
);

View file

@ -29,8 +29,8 @@ export const SmartSafetyNumberModal = memo(function SmartSafetyNumberModal({
<SafetyNumberModal
i18n={i18n}
contact={contact}
safetyNumber={contactSafetyNumber.safetyNumber}
verificationDisabled={contactSafetyNumber.verificationDisabled}
safetyNumber={contactSafetyNumber?.safetyNumber ?? null}
verificationDisabled={contactSafetyNumber?.verificationDisabled ?? null}
toggleSafetyNumberModal={toggleSafetyNumberModal}
generateSafetyNumber={generateSafetyNumber}
toggleVerified={toggleVerified}

View file

@ -30,9 +30,9 @@ export const SmartSafetyNumberViewer = memo(function SmartSafetyNumberViewer({
generateSafetyNumber={generateSafetyNumber}
i18n={i18n}
onClose={onClose}
safetyNumber={safetyNumberContact.safetyNumber}
safetyNumber={safetyNumberContact?.safetyNumber ?? null}
toggleVerified={toggleVerified}
verificationDisabled={safetyNumberContact.verificationDisabled}
verificationDisabled={safetyNumberContact?.verificationDisabled ?? null}
/>
);
});