Refactor smart components
Co-authored-by: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
This commit is contained in:
parent
05c09ef769
commit
27b55e472d
109 changed files with 3583 additions and 2629 deletions
|
@ -1,27 +1,39 @@
|
|||
// Copyright 2020 Signal Messenger, LLC
|
||||
// SPDX-License-Identifier: AGPL-3.0-only
|
||||
|
||||
import { connect } from 'react-redux';
|
||||
import { mapDispatchToProps } from '../actions';
|
||||
import React, { memo } from 'react';
|
||||
import { useSelector } from 'react-redux';
|
||||
import { SafetyNumberModal } from '../../components/SafetyNumberModal';
|
||||
import type { StateType } from '../reducer';
|
||||
import { getContactSafetyNumber } from '../selectors/safetyNumber';
|
||||
import { getConversationSelector } from '../selectors/conversations';
|
||||
import { getIntl } from '../selectors/user';
|
||||
import { useSafetyNumberActions } from '../ducks/safetyNumber';
|
||||
import { useGlobalModalActions } from '../ducks/globalModals';
|
||||
|
||||
export type Props = {
|
||||
export type SmartSafetyNumberModalProps = {
|
||||
contactID: string;
|
||||
};
|
||||
|
||||
const mapStateToProps = (state: StateType, props: Props) => {
|
||||
return {
|
||||
...props,
|
||||
...getContactSafetyNumber(state, props),
|
||||
contact: getConversationSelector(state)(props.contactID),
|
||||
i18n: getIntl(state),
|
||||
};
|
||||
};
|
||||
|
||||
const smart = connect(mapStateToProps, mapDispatchToProps);
|
||||
|
||||
export const SmartSafetyNumberModal = smart(SafetyNumberModal);
|
||||
export const SmartSafetyNumberModal = memo(function SmartSafetyNumberModal({
|
||||
contactID,
|
||||
}: SmartSafetyNumberModalProps) {
|
||||
const i18n = useSelector(getIntl);
|
||||
const conversationSelector = useSelector(getConversationSelector);
|
||||
const contact = conversationSelector(contactID);
|
||||
const contactSafetyNumber = useSelector((state: StateType) => {
|
||||
return getContactSafetyNumber(state, { contactID });
|
||||
});
|
||||
const { generateSafetyNumber, toggleVerified } = useSafetyNumberActions();
|
||||
const { toggleSafetyNumberModal } = useGlobalModalActions();
|
||||
return (
|
||||
<SafetyNumberModal
|
||||
i18n={i18n}
|
||||
contact={contact}
|
||||
safetyNumber={contactSafetyNumber.safetyNumber}
|
||||
verificationDisabled={contactSafetyNumber.verificationDisabled}
|
||||
toggleSafetyNumberModal={toggleSafetyNumberModal}
|
||||
generateSafetyNumber={generateSafetyNumber}
|
||||
toggleVerified={toggleVerified}
|
||||
/>
|
||||
);
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue