mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions 1

Fix error thrown in SmartSafetyNumberModal

Browse source
This commit is contained in:
Jamie Kyle 2024-03-14 12:35:03 -07:00 • committed by GitHub
parent e0c2627dc6
commit d696a2c082
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ts/components/SafetyNumberViewer.stories.tsx
View file

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

6
ts/components/SafetyNumberViewer.tsx
View file

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

2
ts/state/selectors/safetyNumber.ts
View file

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

4
ts/state/smart/SafetyNumberModal.tsx
View file

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

4
ts/state/smart/SafetyNumberViewer.tsx
View file

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