[lib] Simplify logic in `mapThreadsToMessageIDsFromOrderedMessageInfos`
AbandonedPublic
Actions

Authored by atul on Jun 22 2022, 3:31 PM.

Details

Reviewers

• jacek
tomek
• abosh

Summary

Pretty straightforward change.. reduces the number of lines of code (of which message-reducer has plenty)

Depends on D4335

Test Plan

Careful reading, made sure that this syntax works as expected:

Diff Detail

Repository

rCOMM Comm

Branch

june21 (branched from master)

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

atul created this revision.Jun 22 2022, 3:31 PM

Herald added subscribers: • adrian, ashoat. · View Herald TranscriptJun 22 2022, 3:31 PM

atul edited the test plan for this revision. (Show Details)Jun 22 2022, 3:32 PM

Harbormaster completed remote builds in B9899: Diff 13691.Jun 22 2022, 3:36 PM

atul requested review of this revision.Jun 22 2022, 3:36 PM

atul added a child revision: D4337: [lib] Return result of `mergeNewMessages(...) immediately for `fetchMessagesBeforeCursor.success`/`fetchMostReecentMessages.success` action types.Jun 22 2022, 3:44 PM

tomek accepted this revision.Jun 23 2022, 4:47 AM

tomek added inline comments.

lib/reducers/message-reducer.js
106	It doesn't make too much sense to have `threads[messageInfo.threadID] = threads[messageInfo.threadID]` assignment - why do we need to assign a value to itself? (it might be confusing). Instead, we should be a little more explicit with our intention.

This revision is now accepted and ready to land.Jun 23 2022, 4:47 AM

• abosh accepted this revision.Jun 23 2022, 8:01 AM

• abosh added inline comments.

lib/reducers/message-reducer.js
106	I agree.

atul abandoned this revision.Jun 24 2022, 11:23 AM

Revision Contents
Changeset List

Path

Size

lib/

reducers/

message-reducer.js

7 lines

Diff 13691

View Options

lib/reducers/message-reducer.js

Show First 20 Lines • Show All 56 Lines • ▼ Show 20 Lines	import type {
EventSubscription,		EventSubscription,
KeyboardEvent,		KeyboardEvent,
} from '../types/react-native.js';		} from '../types/react-native.js';
import type { ImageStyle } from '../types/styles.js';		import type { ImageStyle } from '../types/styles.js';
import {		import {
runTiming,		runTiming,
ratchetAlongWithKeyboardHeight,		ratchetAlongWithKeyboardHeight,
} from '../utils/animation-utils.js';		} from '../utils/animation-utils.js';
		import { useInitialNotificationsEncryptedMessage } from '../utils/crypto-utils.js';
import {		import {
type StateContainer,		type StateContainer,
type StateChange,		type StateChange,
setStateForContainer,		setStateForContainer,
} from '../utils/state-container.js';		} from '../utils/state-container.js';
import EthereumLogo from '../vectors/ethereum-logo.react.js';		import EthereumLogo from '../vectors/ethereum-logo.react.js';

let initialAppLoad = true;		let initialAppLoad = true;
▲ Show 20 Lines • Show All 58 Lines • ▼ Show 20 Lines	type Props = {
+cookie: ?string,		+cookie: ?string,
+urlPrefix: string,		+urlPrefix: string,
+loggedIn: boolean,		+loggedIn: boolean,
+dimensions: DerivedDimensionsInfo,		+dimensions: DerivedDimensionsInfo,
+splashStyle: ImageStyle,		+splashStyle: ImageStyle,
+styles: typeof unboundStyles,		+styles: typeof unboundStyles,
// Redux dispatch functions		// Redux dispatch functions
+dispatch: Dispatch,		+dispatch: Dispatch,
		// Keyserver olm sessions functions
		+initialNotificationsEncryptedMessage: () => Promise<string>,
};		};
type State = {		type State = {
+mode: LoggedOutMode,		+mode: LoggedOutMode,
+nextMode: LoggedOutMode,		+nextMode: LoggedOutMode,
+logInState: StateContainer<LogInState>,		+logInState: StateContainer<LogInState>,
+registerState: StateContainer<RegisterState>,		+registerState: StateContainer<RegisterState>,
};		};
class LoggedOutModal extends React.PureComponent<Props, State> {		class LoggedOutModal extends React.PureComponent<Props, State> {
▲ Show 20 Lines • Show All 163 Lines • ▼ Show 20 Lines	if (!__DEV__) {
const actionSource = loggedIn		const actionSource = loggedIn
? logInActionSources.appStartReduxLoggedInButInvalidCookie		? logInActionSources.appStartReduxLoggedInButInvalidCookie
: logInActionSources.appStartCookieLoggedInButInvalidRedux;		: logInActionSources.appStartCookieLoggedInButInvalidRedux;
const sessionChange = await fetchNewCookieFromNativeCredentials(		const sessionChange = await fetchNewCookieFromNativeCredentials(
dispatch,		dispatch,
cookie,		cookie,
urlPrefix,		urlPrefix,
actionSource,		actionSource,
		this.props.initialNotificationsEncryptedMessage,
);		);
if (		if (
sessionChange &&		sessionChange &&
sessionChange.cookie &&		sessionChange.cookie &&
sessionChange.cookie.startsWith('user=')		sessionChange.cookie.startsWith('user=')
) {		) {
// success! we can expect subsequent actions to fix up the state		// success! we can expect subsequent actions to fix up the state
return;		return;
▲ Show 20 Lines • Show All 447 Lines • ▼ Show 20 Lines	React.memo<BaseProps>(function ConnectedLoggedOutModal(props: BaseProps) {
const cookie = useSelector(state => state.cookie);		const cookie = useSelector(state => state.cookie);
const urlPrefix = useSelector(state => state.urlPrefix);		const urlPrefix = useSelector(state => state.urlPrefix);
const loggedIn = useSelector(isLoggedIn);		const loggedIn = useSelector(isLoggedIn);
const dimensions = useSelector(derivedDimensionsInfoSelector);		const dimensions = useSelector(derivedDimensionsInfoSelector);
const splashStyle = useSelector(splashStyleSelector);		const splashStyle = useSelector(splashStyleSelector);
const styles = useStyles(unboundStyles);		const styles = useStyles(unboundStyles);

const dispatch = useDispatch();		const dispatch = useDispatch();
		const callInitialNotificationsEncryptedMessage =
		useInitialNotificationsEncryptedMessage();
return (		return (
<LoggedOutModal		<LoggedOutModal
{...props}		{...props}
isForeground={isForeground}		isForeground={isForeground}
persistedStateLoaded={persistedStateLoaded}		persistedStateLoaded={persistedStateLoaded}
rehydrateConcluded={rehydrateConcluded}		rehydrateConcluded={rehydrateConcluded}
cookie={cookie}		cookie={cookie}
urlPrefix={urlPrefix}		urlPrefix={urlPrefix}
loggedIn={loggedIn}		loggedIn={loggedIn}
dimensions={dimensions}		dimensions={dimensions}
splashStyle={splashStyle}		splashStyle={splashStyle}
styles={styles}		styles={styles}
dispatch={dispatch}		dispatch={dispatch}
		initialNotificationsEncryptedMessage={
		callInitialNotificationsEncryptedMessage
		}
/>		/>
);		);
});		});

export default ConnectedLoggedOutModal;		export default ConnectedLoggedOutModal;

[lib] Simplify logic in `mapThreadsToMessageIDsFromOrderedMessageInfos`AbandonedPublicActions