Clarify behavior for SMS-only conversations
This commit is contained in:
parent
85c74e7e68
commit
9b84402fb0
8 changed files with 42 additions and 57 deletions
|
@ -36,6 +36,7 @@ export default {
|
|||
areWePendingApproval: { control: { type: 'boolean' } },
|
||||
},
|
||||
args: {
|
||||
acceptedMessageRequest: true,
|
||||
addAttachment: action('addAttachment'),
|
||||
conversationId: '123',
|
||||
convertDraftBodyRangesIntoHydrated: () => undefined,
|
||||
|
@ -116,8 +117,7 @@ export default {
|
|||
groupAdmins: [],
|
||||
cancelJoinRequest: action('cancelJoinRequest'),
|
||||
showConversation: action('showConversation'),
|
||||
// SMS-only
|
||||
isSMSOnly: false,
|
||||
isSmsOnlyOrUnregistered: false,
|
||||
isFetchingUUID: false,
|
||||
renderSmartCompositionRecording: _ => <div>RECORDING</div>,
|
||||
renderSmartCompositionRecordingDraft: _ => <div>RECORDING DRAFT</div>,
|
||||
|
@ -158,17 +158,26 @@ export function StickerButton(args: Props): JSX.Element {
|
|||
|
||||
export function MessageRequest(args: Props): JSX.Element {
|
||||
const theme = useContext(StorybookThemeContext);
|
||||
return <CompositionArea {...args} theme={theme} />;
|
||||
return (
|
||||
<CompositionArea {...args} theme={theme} acceptedMessageRequest={false} />
|
||||
);
|
||||
}
|
||||
|
||||
export function SmsOnlyFetchingUuid(args: Props): JSX.Element {
|
||||
const theme = useContext(StorybookThemeContext);
|
||||
return <CompositionArea {...args} theme={theme} isSMSOnly isFetchingUUID />;
|
||||
return (
|
||||
<CompositionArea
|
||||
{...args}
|
||||
theme={theme}
|
||||
isSmsOnlyOrUnregistered
|
||||
isFetchingUUID
|
||||
/>
|
||||
);
|
||||
}
|
||||
|
||||
export function SmsOnly(args: Props): JSX.Element {
|
||||
const theme = useContext(StorybookThemeContext);
|
||||
return <CompositionArea {...args} theme={theme} isSMSOnly />;
|
||||
return <CompositionArea {...args} theme={theme} isSmsOnlyOrUnregistered />;
|
||||
}
|
||||
|
||||
export function Attachments(args: Props): JSX.Element {
|
||||
|
|
|
@ -118,7 +118,7 @@ export type OwnProps = Readonly<{
|
|||
recordingState: RecordingState;
|
||||
messageCompositionId: string;
|
||||
shouldHidePopovers: boolean | null;
|
||||
isSMSOnly: boolean | null;
|
||||
isSmsOnlyOrUnregistered: boolean | null;
|
||||
left: boolean | null;
|
||||
linkPreviewLoading: boolean;
|
||||
linkPreviewResult: LinkPreviewType | null;
|
||||
|
@ -331,7 +331,7 @@ export const CompositionArea = memo(function CompositionArea({
|
|||
cancelJoinRequest,
|
||||
showConversation,
|
||||
// SMS-only contacts
|
||||
isSMSOnly,
|
||||
isSmsOnlyOrUnregistered,
|
||||
isFetchingUUID,
|
||||
renderSmartCompositionRecording,
|
||||
renderSmartCompositionRecordingDraft,
|
||||
|
@ -800,7 +800,7 @@ export const CompositionArea = memo(function CompositionArea({
|
|||
);
|
||||
}
|
||||
|
||||
if (conversationType === 'direct' && isSMSOnly) {
|
||||
if (conversationType === 'direct' && isSmsOnlyOrUnregistered) {
|
||||
return (
|
||||
<div
|
||||
className={classNames([
|
||||
|
|
|
@ -211,7 +211,7 @@ export function PrivateConvo(): JSX.Element {
|
|||
title: 'SMS-only conversation',
|
||||
props: {
|
||||
...commonProps,
|
||||
isSMSOnly: true,
|
||||
isSmsOnlyOrUnregistered: true,
|
||||
conversation: getDefaultConversation({
|
||||
color: getRandomColor(),
|
||||
title: '(202) 555-0006',
|
||||
|
|
|
@ -100,7 +100,7 @@ export type PropsDataType = {
|
|||
isMissingMandatoryProfileSharing?: boolean;
|
||||
isSelectMode: boolean;
|
||||
isSignalConversation?: boolean;
|
||||
isSMSOnly?: boolean;
|
||||
isSmsOnlyOrUnregistered?: boolean;
|
||||
outgoingCallButtonStyle: OutgoingCallButtonStyle;
|
||||
sharedGroupNames: ReadonlyArray<string>;
|
||||
theme: ThemeType;
|
||||
|
@ -159,7 +159,7 @@ export const ConversationHeader = memo(function ConversationHeader({
|
|||
isMissingMandatoryProfileSharing,
|
||||
isSelectMode,
|
||||
isSignalConversation,
|
||||
isSMSOnly,
|
||||
isSmsOnlyOrUnregistered,
|
||||
localDeleteWarningShown,
|
||||
onConversationAccept,
|
||||
onConversationArchive,
|
||||
|
@ -295,7 +295,7 @@ export const ConversationHeader = memo(function ConversationHeader({
|
|||
onViewUserStories={onViewUserStories}
|
||||
onViewConversationDetails={onViewConversationDetails}
|
||||
/>
|
||||
{!isSMSOnly && !isSignalConversation && (
|
||||
{!isSmsOnlyOrUnregistered && !isSignalConversation && (
|
||||
<OutgoingCallButtons
|
||||
conversation={conversation}
|
||||
hasActiveCall={hasActiveCall}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue