Page MenuHomePhabricator
Differential D7496

[native] Add empty RegistrationNavigator & KeyserverSelection
ClosedPublic
Actions

Authored by ashoat on Apr 18 2023, 11:45 AM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 9, 6:21 AM
Unknown Object (File)
Mar 12 2025, 3:18 AM
Unknown Object (File)
Mar 9 2025, 3:43 AM
Unknown Object (File)
Mar 9 2025, 3:43 AM
Unknown Object (File)
Mar 9 2025, 3:43 AM
Unknown Object (File)
Mar 9 2025, 3:43 AM
Unknown Object (File)
Mar 9 2025, 3:42 AM
Unknown Object (File)
Mar 9 2025, 3:38 AM
View All Files
Subscribers
tomek

Details

Reviewers
ginsu
atul
Commits
rCOMM5e5a4813fad8: [native] Add empty RegistrationNavigator & KeyserverSelection
Summary

This diff adds the plumbing for RegistrationNavigator and KeyserverSelection, and makes the new registration button open it.

Depends on D7495

Test Plan
recording

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

ashoat created this revision.Apr 18 2023, 11:45 AM
Herald added a subscriber: tomek. · View Herald TranscriptApr 18 2023, 11:45 AM
ashoat added inline comments.Apr 18 2023, 11:46 AM
native/account/registration-modal.react.js
12 ↗(On Diff #25295)

Flow complains if I remove the props param, and ESLint complains if I leave it in unused

Harbormaster completed remote builds in B18469: Diff 25295.Apr 18 2023, 12:03 PM
ashoat requested review of this revision.Apr 18 2023, 12:03 PM
ashoat updated this revision to Diff 25297.Apr 18 2023, 12:16 PM

Realized we need a separate StackNavigator for registration

ashoat retitled this revision from [native] Add empty RegistrationModal to [native] Add empty RegistrationNavigator & KeyserverSelection.Apr 18 2023, 12:18 PM
ashoat edited the summary of this revision. (Show Details)
ashoat edited the test plan for this revision. (Show Details)
Harbormaster completed remote builds in B18471: Diff 25297.Apr 18 2023, 12:33 PM
ashoat updated this revision to Diff 25300.Apr 18 2023, 12:52 PM

Clean up, fix styles, remove KeyboardAvoidingView.

Sorry for the repeated iterations here; should be ready for review now.

ashoat edited the test plan for this revision. (Show Details)Apr 18 2023, 12:53 PM
ashoat added a child revision: D7500: [native] Style RegistrationNavigator header.Apr 18 2023, 12:54 PM
ashoat added inline comments.Apr 18 2023, 1:06 PM
native/account/registration/keyserver-selection.react.js
14 ↗(On Diff #25300)

Flow complains if I remove the props param, and ESLint complains if I leave it in unused

native/account/registration/registration-navigator.react.js
33 ↗(On Diff #25300)

Flow complains if I remove the props param, and ESLint complains if I leave it in unused

Harbormaster completed remote builds in B18474: Diff 25300.Apr 18 2023, 1:09 PM
atul accepted this revision.Apr 19 2023, 9:40 AM
This revision is now accepted and ready to land.Apr 19 2023, 9:40 AM
Closed by commit rCOMM5e5a4813fad8: [native] Add empty RegistrationNavigator & KeyserverSelection (authored by ashoat). · Explain WhyApr 19 2023, 6:39 PM
This revision was automatically updated to reflect the committed changes.
ashoat added a commit: rCOMM5e5a4813fad8: [native] Add empty RegistrationNavigator & KeyserverSelection.

Revision Contents
Changeset List

PathSize
native/
account/
87 lines
registration/
34 lines
55 lines
navigation/
7 lines
8 lines

Diff 25441

View Options

native/account/logged-out-modal.react.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import { import {
pushTypes, pushTypes,
type CreateMessageInfoParams, type CreateMessageInfoParams,
type MessageSpec, type MessageSpec,
type NotificationTextsParams,
} from './message-spec.js'; } from './message-spec.js';
import { joinResult } from './utils.js'; import { joinResult } from './utils.js';
import type { PlatformDetails } from '../../types/device-types.js'; import type { PlatformDetails } from '../../types/device-types.js';
import { messageTypes } from '../../types/message-types.js'; import { messageTypes } from '../../types/message-types.js';
import type { import type {
MessageInfo, MessageInfo,
ClientDBMessageInfo, ClientDBMessageInfo,
} from '../../types/message-types.js'; } from '../../types/message-types.js';
import type { import type {
CreateSidebarMessageData, CreateSidebarMessageData,
CreateSidebarMessageInfo, CreateSidebarMessageInfo,
RawCreateSidebarMessageInfo, RawCreateSidebarMessageInfo,
} from '../../types/messages/create-sidebar.js'; } from '../../types/messages/create-sidebar.js';
import type { RawUnsupportedMessageInfo } from '../../types/messages/unsupported.js'; import type { RawUnsupportedMessageInfo } from '../../types/messages/unsupported.js';
import type { NotifTexts } from '../../types/notif-types.js'; import type { NotifTexts } from '../../types/notif-types.js';
import type { ThreadInfo } from '../../types/thread-types.js'; import type { ThreadInfo } from '../../types/thread-types.js';
import type { RelativeUserInfo } from '../../types/user-types.js'; import type { RelativeUserInfo } from '../../types/user-types.js';
import { import {
ET, ET,
type EntityText, type EntityText,
pluralizeEntityText, pluralizeEntityText,
} from '../../utils/entity-text.js'; } from '../../utils/entity-text.js';
import { isMentioned } from '../mention-utils.js';
import { hasMinCodeVersion } from '../version-utils.js'; import { hasMinCodeVersion } from '../version-utils.js';
export const createSidebarMessageSpec: MessageSpec< export const createSidebarMessageSpec: MessageSpec<
CreateSidebarMessageData, CreateSidebarMessageData,
RawCreateSidebarMessageInfo, RawCreateSidebarMessageInfo,
CreateSidebarMessageInfo, CreateSidebarMessageInfo,
> = Object.freeze({ > = Object.freeze({
messageContentForServerDB( messageContentForServerDB(
▲ Show 20 Lines • Show All 134 Lines • ▼ Show 20 Lines unshimMessageInfo(
unwrapped: RawCreateSidebarMessageInfo, unwrapped: RawCreateSidebarMessageInfo,
): RawCreateSidebarMessageInfo { ): RawCreateSidebarMessageInfo {
return unwrapped; return unwrapped;
}, },
async notificationTexts( async notificationTexts(
messageInfos: $ReadOnlyArray<MessageInfo>, messageInfos: $ReadOnlyArray<MessageInfo>,
threadInfo: ThreadInfo, threadInfo: ThreadInfo,
params: NotificationTextsParams,
): Promise<NotifTexts> { ): Promise<NotifTexts> {
const firstMessageInfo = messageInfos[0]; const firstMessageInfo = messageInfos[0];
invariant( invariant(
firstMessageInfo.type === messageTypes.CREATE_SIDEBAR, firstMessageInfo.type === messageTypes.CREATE_SIDEBAR,
'firstMessageInfo should be messageTypes.CREATE_SIDEBAR!', 'firstMessageInfo should be messageTypes.CREATE_SIDEBAR!',
); );
const creator = ET.user({ userInfo: firstMessageInfo.creator }); const creator = ET.user({ userInfo: firstMessageInfo.creator });
const prefix = ET`${creator}`; const prefix = ET`${creator}`;
const initialName = firstMessageInfo.initialThreadState.name; const initialName = firstMessageInfo.initialThreadState.name;
const sourceMessageAuthorPossessive = ET.user({ const sourceMessageAuthorPossessive = ET.user({
userInfo: firstMessageInfo.sourceMessageAuthor, userInfo: firstMessageInfo.sourceMessageAuthor,
possessive: true, possessive: true,
}); });
let body = `started a thread in response to `; let body = `started a thread in response to `;
body = ET`${body} ${sourceMessageAuthorPossessive} message`; body = ET`${body} ${sourceMessageAuthorPossessive} message`;
if (initialName) {
const { username } = params.notifTargetUserInfo;
const secondMessageInfo = messageInfos[1];
if (
username &&
secondMessageInfo &&
secondMessageInfo.type === messageTypes.SIDEBAR_SOURCE &&
secondMessageInfo.sourceMessage.type === messageTypes.TEXT &&
isMentioned(username, secondMessageInfo.sourceMessage.text)
) {
body = ET`${body} that tagged you`;
} else if (initialName) {
body = ET`${body} "${initialName}"`; body = ET`${body} "${initialName}"`;
} }
return { return {
merged: ET`${prefix} ${body}`, merged: ET`${prefix} ${body}`,
body, body,
title: threadInfo.uiName, title: threadInfo.uiName,
prefix, prefix,
Show All 20 Lines
View Options

native/account/registration/keyserver-selection.react.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import { import {
pushTypes, pushTypes,
type CreateMessageInfoParams, type CreateMessageInfoParams,
type MessageSpec, type MessageSpec,
type NotificationTextsParams,
} from './message-spec.js'; } from './message-spec.js';
import { joinResult } from './utils.js'; import { joinResult } from './utils.js';
import type { PlatformDetails } from '../../types/device-types.js'; import type { PlatformDetails } from '../../types/device-types.js';
import { messageTypes } from '../../types/message-types.js'; import { messageTypes } from '../../types/message-types.js';
import type { import type {
MessageInfo, MessageInfo,
ClientDBMessageInfo, ClientDBMessageInfo,
} from '../../types/message-types.js'; } from '../../types/message-types.js';
import type { import type {
CreateSidebarMessageData, CreateSidebarMessageData,
CreateSidebarMessageInfo, CreateSidebarMessageInfo,
RawCreateSidebarMessageInfo, RawCreateSidebarMessageInfo,
} from '../../types/messages/create-sidebar.js'; } from '../../types/messages/create-sidebar.js';
import type { RawUnsupportedMessageInfo } from '../../types/messages/unsupported.js'; import type { RawUnsupportedMessageInfo } from '../../types/messages/unsupported.js';
import type { NotifTexts } from '../../types/notif-types.js'; import type { NotifTexts } from '../../types/notif-types.js';
import type { ThreadInfo } from '../../types/thread-types.js'; import type { ThreadInfo } from '../../types/thread-types.js';
import type { RelativeUserInfo } from '../../types/user-types.js'; import type { RelativeUserInfo } from '../../types/user-types.js';
import { import {
ET, ET,
type EntityText, type EntityText,
pluralizeEntityText, pluralizeEntityText,
} from '../../utils/entity-text.js'; } from '../../utils/entity-text.js';
import { isMentioned } from '../mention-utils.js';
import { hasMinCodeVersion } from '../version-utils.js'; import { hasMinCodeVersion } from '../version-utils.js';
export const createSidebarMessageSpec: MessageSpec< export const createSidebarMessageSpec: MessageSpec<
CreateSidebarMessageData, CreateSidebarMessageData,
RawCreateSidebarMessageInfo, RawCreateSidebarMessageInfo,
CreateSidebarMessageInfo, CreateSidebarMessageInfo,
> = Object.freeze({ > = Object.freeze({
messageContentForServerDB( messageContentForServerDB(
▲ Show 20 Lines • Show All 134 Lines • ▼ Show 20 Lines unshimMessageInfo(
unwrapped: RawCreateSidebarMessageInfo, unwrapped: RawCreateSidebarMessageInfo,
): RawCreateSidebarMessageInfo { ): RawCreateSidebarMessageInfo {
return unwrapped; return unwrapped;
}, },
async notificationTexts( async notificationTexts(
messageInfos: $ReadOnlyArray<MessageInfo>, messageInfos: $ReadOnlyArray<MessageInfo>,
threadInfo: ThreadInfo, threadInfo: ThreadInfo,
params: NotificationTextsParams,
): Promise<NotifTexts> { ): Promise<NotifTexts> {
const firstMessageInfo = messageInfos[0]; const firstMessageInfo = messageInfos[0];
invariant( invariant(
firstMessageInfo.type === messageTypes.CREATE_SIDEBAR, firstMessageInfo.type === messageTypes.CREATE_SIDEBAR,
'firstMessageInfo should be messageTypes.CREATE_SIDEBAR!', 'firstMessageInfo should be messageTypes.CREATE_SIDEBAR!',
); );
const creator = ET.user({ userInfo: firstMessageInfo.creator }); const creator = ET.user({ userInfo: firstMessageInfo.creator });
const prefix = ET`${creator}`; const prefix = ET`${creator}`;
const initialName = firstMessageInfo.initialThreadState.name; const initialName = firstMessageInfo.initialThreadState.name;
const sourceMessageAuthorPossessive = ET.user({ const sourceMessageAuthorPossessive = ET.user({
userInfo: firstMessageInfo.sourceMessageAuthor, userInfo: firstMessageInfo.sourceMessageAuthor,
possessive: true, possessive: true,
}); });
let body = `started a thread in response to `; let body = `started a thread in response to `;
body = ET`${body} ${sourceMessageAuthorPossessive} message`; body = ET`${body} ${sourceMessageAuthorPossessive} message`;
if (initialName) {
const { username } = params.notifTargetUserInfo;
const secondMessageInfo = messageInfos[1];
if (
username &&
secondMessageInfo &&
secondMessageInfo.type === messageTypes.SIDEBAR_SOURCE &&
secondMessageInfo.sourceMessage.type === messageTypes.TEXT &&
isMentioned(username, secondMessageInfo.sourceMessage.text)
) {
body = ET`${body} that tagged you`;
} else if (initialName) {
body = ET`${body} "${initialName}"`; body = ET`${body} "${initialName}"`;
} }
return { return {
merged: ET`${prefix} ${body}`, merged: ET`${prefix} ${body}`,
body, body,
title: threadInfo.uiName, title: threadInfo.uiName,
prefix, prefix,
Show All 20 Lines
View Options

native/account/registration/registration-navigator.react.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import { import {
pushTypes, pushTypes,
type CreateMessageInfoParams, type CreateMessageInfoParams,
type MessageSpec, type MessageSpec,
type NotificationTextsParams,
} from './message-spec.js'; } from './message-spec.js';
import { joinResult } from './utils.js'; import { joinResult } from './utils.js';
import type { PlatformDetails } from '../../types/device-types.js'; import type { PlatformDetails } from '../../types/device-types.js';
import { messageTypes } from '../../types/message-types.js'; import { messageTypes } from '../../types/message-types.js';
import type { import type {
MessageInfo, MessageInfo,
ClientDBMessageInfo, ClientDBMessageInfo,
} from '../../types/message-types.js'; } from '../../types/message-types.js';
import type { import type {
CreateSidebarMessageData, CreateSidebarMessageData,
CreateSidebarMessageInfo, CreateSidebarMessageInfo,
RawCreateSidebarMessageInfo, RawCreateSidebarMessageInfo,
} from '../../types/messages/create-sidebar.js'; } from '../../types/messages/create-sidebar.js';
import type { RawUnsupportedMessageInfo } from '../../types/messages/unsupported.js'; import type { RawUnsupportedMessageInfo } from '../../types/messages/unsupported.js';
import type { NotifTexts } from '../../types/notif-types.js'; import type { NotifTexts } from '../../types/notif-types.js';
import type { ThreadInfo } from '../../types/thread-types.js'; import type { ThreadInfo } from '../../types/thread-types.js';
import type { RelativeUserInfo } from '../../types/user-types.js'; import type { RelativeUserInfo } from '../../types/user-types.js';
import { import {
ET, ET,
type EntityText, type EntityText,
pluralizeEntityText, pluralizeEntityText,
} from '../../utils/entity-text.js'; } from '../../utils/entity-text.js';
import { isMentioned } from '../mention-utils.js';
import { hasMinCodeVersion } from '../version-utils.js'; import { hasMinCodeVersion } from '../version-utils.js';
export const createSidebarMessageSpec: MessageSpec< export const createSidebarMessageSpec: MessageSpec<
CreateSidebarMessageData, CreateSidebarMessageData,
RawCreateSidebarMessageInfo, RawCreateSidebarMessageInfo,
CreateSidebarMessageInfo, CreateSidebarMessageInfo,
> = Object.freeze({ > = Object.freeze({
messageContentForServerDB( messageContentForServerDB(
▲ Show 20 Lines • Show All 134 Lines • ▼ Show 20 Lines unshimMessageInfo(
unwrapped: RawCreateSidebarMessageInfo, unwrapped: RawCreateSidebarMessageInfo,
): RawCreateSidebarMessageInfo { ): RawCreateSidebarMessageInfo {
return unwrapped; return unwrapped;
}, },
async notificationTexts( async notificationTexts(
messageInfos: $ReadOnlyArray<MessageInfo>, messageInfos: $ReadOnlyArray<MessageInfo>,
threadInfo: ThreadInfo, threadInfo: ThreadInfo,
params: NotificationTextsParams,
): Promise<NotifTexts> { ): Promise<NotifTexts> {
const firstMessageInfo = messageInfos[0]; const firstMessageInfo = messageInfos[0];
invariant( invariant(
firstMessageInfo.type === messageTypes.CREATE_SIDEBAR, firstMessageInfo.type === messageTypes.CREATE_SIDEBAR,
'firstMessageInfo should be messageTypes.CREATE_SIDEBAR!', 'firstMessageInfo should be messageTypes.CREATE_SIDEBAR!',
); );
const creator = ET.user({ userInfo: firstMessageInfo.creator }); const creator = ET.user({ userInfo: firstMessageInfo.creator });
const prefix = ET`${creator}`; const prefix = ET`${creator}`;
const initialName = firstMessageInfo.initialThreadState.name; const initialName = firstMessageInfo.initialThreadState.name;
const sourceMessageAuthorPossessive = ET.user({ const sourceMessageAuthorPossessive = ET.user({
userInfo: firstMessageInfo.sourceMessageAuthor, userInfo: firstMessageInfo.sourceMessageAuthor,
possessive: true, possessive: true,
}); });
let body = `started a thread in response to `; let body = `started a thread in response to `;
body = ET`${body} ${sourceMessageAuthorPossessive} message`; body = ET`${body} ${sourceMessageAuthorPossessive} message`;
if (initialName) {
const { username } = params.notifTargetUserInfo;
const secondMessageInfo = messageInfos[1];
if (
username &&
secondMessageInfo &&
secondMessageInfo.type === messageTypes.SIDEBAR_SOURCE &&
secondMessageInfo.sourceMessage.type === messageTypes.TEXT &&
isMentioned(username, secondMessageInfo.sourceMessage.text)
) {
body = ET`${body} that tagged you`;
} else if (initialName) {
body = ET`${body} "${initialName}"`; body = ET`${body} "${initialName}"`;
} }
return { return {
merged: ET`${prefix} ${body}`, merged: ET`${prefix} ${body}`,
body, body,
title: threadInfo.uiName, title: threadInfo.uiName,
prefix, prefix,
Show All 20 Lines
View Options

native/navigation/root-navigator.react.js

// @flow // @flow
import invariant from 'invariant'; import invariant from 'invariant';
import { import {
pushTypes, pushTypes,
type CreateMessageInfoParams, type CreateMessageInfoParams,
type MessageSpec, type MessageSpec,
type NotificationTextsParams,
} from './message-spec.js'; } from './message-spec.js';
import { joinResult } from './utils.js'; import { joinResult } from './utils.js';
import type { PlatformDetails } from '../../types/device-types.js'; import type { PlatformDetails } from '../../types/device-types.js';
import { messageTypes } from '../../types/message-types.js'; import { messageTypes } from '../../types/message-types.js';
import type { import type {
MessageInfo, MessageInfo,
ClientDBMessageInfo, ClientDBMessageInfo,
} from '../../types/message-types.js'; } from '../../types/message-types.js';
import type { import type {
CreateSidebarMessageData, CreateSidebarMessageData,
CreateSidebarMessageInfo, CreateSidebarMessageInfo,
RawCreateSidebarMessageInfo, RawCreateSidebarMessageInfo,
} from '../../types/messages/create-sidebar.js'; } from '../../types/messages/create-sidebar.js';
import type { RawUnsupportedMessageInfo } from '../../types/messages/unsupported.js'; import type { RawUnsupportedMessageInfo } from '../../types/messages/unsupported.js';
import type { NotifTexts } from '../../types/notif-types.js'; import type { NotifTexts } from '../../types/notif-types.js';
import type { ThreadInfo } from '../../types/thread-types.js'; import type { ThreadInfo } from '../../types/thread-types.js';
import type { RelativeUserInfo } from '../../types/user-types.js'; import type { RelativeUserInfo } from '../../types/user-types.js';
import { import {
ET, ET,
type EntityText, type EntityText,
pluralizeEntityText, pluralizeEntityText,
} from '../../utils/entity-text.js'; } from '../../utils/entity-text.js';
import { isMentioned } from '../mention-utils.js';
import { hasMinCodeVersion } from '../version-utils.js'; import { hasMinCodeVersion } from '../version-utils.js';
export const createSidebarMessageSpec: MessageSpec< export const createSidebarMessageSpec: MessageSpec<
CreateSidebarMessageData, CreateSidebarMessageData,
RawCreateSidebarMessageInfo, RawCreateSidebarMessageInfo,
CreateSidebarMessageInfo, CreateSidebarMessageInfo,
> = Object.freeze({ > = Object.freeze({
messageContentForServerDB( messageContentForServerDB(
▲ Show 20 Lines • Show All 134 Lines • ▼ Show 20 Lines unshimMessageInfo(
unwrapped: RawCreateSidebarMessageInfo, unwrapped: RawCreateSidebarMessageInfo,
): RawCreateSidebarMessageInfo { ): RawCreateSidebarMessageInfo {
return unwrapped; return unwrapped;
}, },
async notificationTexts( async notificationTexts(
messageInfos: $ReadOnlyArray<MessageInfo>, messageInfos: $ReadOnlyArray<MessageInfo>,
threadInfo: ThreadInfo, threadInfo: ThreadInfo,
params: NotificationTextsParams,
): Promise<NotifTexts> { ): Promise<NotifTexts> {
const firstMessageInfo = messageInfos[0]; const firstMessageInfo = messageInfos[0];
invariant( invariant(
firstMessageInfo.type === messageTypes.CREATE_SIDEBAR, firstMessageInfo.type === messageTypes.CREATE_SIDEBAR,
'firstMessageInfo should be messageTypes.CREATE_SIDEBAR!', 'firstMessageInfo should be messageTypes.CREATE_SIDEBAR!',
); );
const creator = ET.user({ userInfo: firstMessageInfo.creator }); const creator = ET.user({ userInfo: firstMessageInfo.creator });
const prefix = ET`${creator}`; const prefix = ET`${creator}`;
const initialName = firstMessageInfo.initialThreadState.name; const initialName = firstMessageInfo.initialThreadState.name;
const sourceMessageAuthorPossessive = ET.user({ const sourceMessageAuthorPossessive = ET.user({
userInfo: firstMessageInfo.sourceMessageAuthor, userInfo: firstMessageInfo.sourceMessageAuthor,
possessive: true, possessive: true,
}); });
let body = `started a thread in response to `; let body = `started a thread in response to `;
body = ET`${body} ${sourceMessageAuthorPossessive} message`; body = ET`${body} ${sourceMessageAuthorPossessive} message`;
if (initialName) {
const { username } = params.notifTargetUserInfo;
const secondMessageInfo = messageInfos[1];
if (
username &&
secondMessageInfo &&
secondMessageInfo.type === messageTypes.SIDEBAR_SOURCE &&
secondMessageInfo.sourceMessage.type === messageTypes.TEXT &&
isMentioned(username, secondMessageInfo.sourceMessage.text)
) {
body = ET`${body} that tagged you`;
} else if (initialName) {
body = ET`${body} "${initialName}"`; body = ET`${body} "${initialName}"`;
} }
return { return {
merged: ET`${prefix} ${body}`, merged: ET`${prefix} ${body}`,
body, body,
title: threadInfo.uiName, title: threadInfo.uiName,
prefix, prefix,
Show All 20 Lines
View Options

native/navigation/route-names.js

Loading...