Page MenuHomePhabricator
Differential D13462

[lib] Update thick thread avatars logic
ClosedPublic
Actions

Authored by tomek on Sep 25 2024, 8:33 AM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Mar 21, 12:03 AM
Unknown Object (File)
Thu, Mar 13, 9:07 PM
Unknown Object (File)
Feb 18 2025, 2:29 AM
Unknown Object (File)
Feb 18 2025, 2:29 AM
Unknown Object (File)
Feb 18 2025, 2:29 AM
Unknown Object (File)
Feb 18 2025, 2:29 AM
Unknown Object (File)
Feb 18 2025, 2:29 AM
Unknown Object (File)
Feb 18 2025, 2:29 AM
View All Files
Subscribers
None

Details

Reviewers
kamil
will
Commits
rCOMM78023115da35: [lib] Update thick thread avatars logic
Summary

We should correctly select thick thread avatar based on user avatars.

https://linear.app/comm/issue/ENG-9374/thread-avatars-not-using-user-avatars-for-dms

Test Plan

Created personal and private thick threads and verified that on a thread list their avatars are correct, and before this diff they were incorrect.

Diff Detail

Repository
rCOMM Comm
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

tomek created this revision.Sep 25 2024, 8:33 AM
tomek edited reviewers, added: will; removed: ashoat.Sep 25 2024, 8:34 AM
tomek added inline comments.
lib/shared/avatar-utils.js
7 ↗(On Diff #44552)

Shortened the import

293 ↗(On Diff #44552)

Simplified this expression - it didn't make too much sense in the previous form

Harbormaster completed remote builds in B31844: Diff 44552.Sep 25 2024, 8:51 AM
tomek requested review of this revision.Sep 25 2024, 8:51 AM
will accepted this revision.Sep 25 2024, 8:54 AM
This revision is now accepted and ready to land.Sep 25 2024, 8:54 AM
tomek updated this revision to Diff 44556.Sep 25 2024, 8:57 AM

Update invariant message

Harbormaster completed remote builds in B31846: Diff 44556.Sep 25 2024, 9:15 AM
tomek updated this revision to Diff 44619.Sep 27 2024, 2:54 AM

Rebase

tomek updated this revision to Diff 44620.Sep 27 2024, 2:56 AM

Fix imports

Harbormaster failed remote builds in B31894: Diff 44619!Sep 27 2024, 3:07 AM
Harbormaster completed remote builds in B31895: Diff 44620.Sep 27 2024, 3:13 AM
Closed by commit rCOMM78023115da35: [lib] Update thick thread avatars logic (authored by tomek). · Explain WhySep 27 2024, 3:54 AM
This revision was automatically updated to reflect the committed changes.
tomek added a commit: rCOMM78023115da35: [lib] Update thick thread avatars logic.
ashoat mentioned this in D13549: [web] Update thick threads avatar logic for web.Sep 30 2024, 10:09 PM
ashoat mentioned this in rCOMMfe2ee67a2e28: [web] Update thick threads avatar logic for web.Oct 1 2024, 9:07 AM

Revision Contents
Changeset List

PathSize
lib/
shared/
17 lines
6 lines
native/
avatars/
9 lines

Diff 44620

View Options

lib/shared/avatar-utils.js

Show All 40 Lines
import { TextInput } from './modal-components.react.js'; import { TextInput } from './modal-components.react.js';
import { setNativeCredentials } from './native-credentials.js'; import { setNativeCredentials } from './native-credentials.js';
import { PanelButton, Panel } from './panel-components.react.js'; import { PanelButton, Panel } from './panel-components.react.js';
import SWMansionIcon from '../components/swmansion-icon.react.js'; import SWMansionIcon from '../components/swmansion-icon.react.js';
import { useSelector } from '../redux/redux-utils.js'; import { useSelector } from '../redux/redux-utils.js';
import { nativeLogInExtraInfoSelector } from '../selectors/account-selectors.js'; import { nativeLogInExtraInfoSelector } from '../selectors/account-selectors.js';
import type { KeyPressEvent } from '../types/react-native.js'; import type { KeyPressEvent } from '../types/react-native.js';
import { AppOutOfDateAlertDetails } from '../utils/alert-messages.js'; import {
AppOutOfDateAlertDetails,
UsernameReservedAlertDetails,
UsernameTakenAlertDetails,
} from '../utils/alert-messages.js';
import Alert from '../utils/alert.js'; import Alert from '../utils/alert.js';
import { nativeNotificationsSessionCreator } from '../utils/crypto-utils.js'; import { nativeNotificationsSessionCreator } from '../utils/crypto-utils.js';
import { type StateContainer } from '../utils/state-container.js'; import { type StateContainer } from '../utils/state-container.js';
type WritableRegisterState = { type WritableRegisterState = {
usernameInputText: string, usernameInputText: string,
passwordInputText: string, passwordInputText: string,
confirmPasswordInputText: string, confirmPasswordInputText: string,
▲ Show 20 Lines • Show All 302 Lines • ▼ Show 20 Lines try {
await setNativeCredentials({ await setNativeCredentials({
username: result.currentUserInfo.username, username: result.currentUserInfo.username,
password: this.props.registerState.state.passwordInputText, password: this.props.registerState.state.passwordInputText,
}); });
return result; return result;
} catch (e) { } catch (e) {
if (e.message === 'username_reserved') { if (e.message === 'username_reserved') {
Alert.alert( Alert.alert(
'Username reserved', UsernameReservedAlertDetails.title,
'This username is currently reserved. Please contact support@' + UsernameReservedAlertDetails.message,
'comm.app if you would like to claim this account.',
[{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }], [{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }],
{ cancelable: false }, { cancelable: false },
); );
} else if (e.message === 'username_taken') { } else if (e.message === 'username_taken') {
Alert.alert( Alert.alert(
'Username taken', UsernameTakenAlertDetails.title,
'An account with that username already exists', UsernameTakenAlertDetails.message,
[{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }], [{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }],
{ cancelable: false }, { cancelable: false },
); );
} else if (e.message === 'client_version_unsupported') { } else if (e.message === 'client_version_unsupported') {
Alert.alert( Alert.alert(
AppOutOfDateAlertDetails.title, AppOutOfDateAlertDetails.title,
AppOutOfDateAlertDetails.message, AppOutOfDateAlertDetails.message,
[{ text: 'OK', onPress: this.onAppOutOfDateAlertAcknowledged }], [{ text: 'OK', onPress: this.onAppOutOfDateAlertAcknowledged }],
▲ Show 20 Lines • Show All 120 Lines • Show Last 20 Lines
View Options

lib/shared/thread-utils.js

Show All 40 Lines
import { TextInput } from './modal-components.react.js'; import { TextInput } from './modal-components.react.js';
import { setNativeCredentials } from './native-credentials.js'; import { setNativeCredentials } from './native-credentials.js';
import { PanelButton, Panel } from './panel-components.react.js'; import { PanelButton, Panel } from './panel-components.react.js';
import SWMansionIcon from '../components/swmansion-icon.react.js'; import SWMansionIcon from '../components/swmansion-icon.react.js';
import { useSelector } from '../redux/redux-utils.js'; import { useSelector } from '../redux/redux-utils.js';
import { nativeLogInExtraInfoSelector } from '../selectors/account-selectors.js'; import { nativeLogInExtraInfoSelector } from '../selectors/account-selectors.js';
import type { KeyPressEvent } from '../types/react-native.js'; import type { KeyPressEvent } from '../types/react-native.js';
import { AppOutOfDateAlertDetails } from '../utils/alert-messages.js'; import {
AppOutOfDateAlertDetails,
UsernameReservedAlertDetails,
UsernameTakenAlertDetails,
} from '../utils/alert-messages.js';
import Alert from '../utils/alert.js'; import Alert from '../utils/alert.js';
import { nativeNotificationsSessionCreator } from '../utils/crypto-utils.js'; import { nativeNotificationsSessionCreator } from '../utils/crypto-utils.js';
import { type StateContainer } from '../utils/state-container.js'; import { type StateContainer } from '../utils/state-container.js';
type WritableRegisterState = { type WritableRegisterState = {
usernameInputText: string, usernameInputText: string,
passwordInputText: string, passwordInputText: string,
confirmPasswordInputText: string, confirmPasswordInputText: string,
▲ Show 20 Lines • Show All 302 Lines • ▼ Show 20 Lines try {
await setNativeCredentials({ await setNativeCredentials({
username: result.currentUserInfo.username, username: result.currentUserInfo.username,
password: this.props.registerState.state.passwordInputText, password: this.props.registerState.state.passwordInputText,
}); });
return result; return result;
} catch (e) { } catch (e) {
if (e.message === 'username_reserved') { if (e.message === 'username_reserved') {
Alert.alert( Alert.alert(
'Username reserved', UsernameReservedAlertDetails.title,
'This username is currently reserved. Please contact support@' + UsernameReservedAlertDetails.message,
'comm.app if you would like to claim this account.',
[{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }], [{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }],
{ cancelable: false }, { cancelable: false },
); );
} else if (e.message === 'username_taken') { } else if (e.message === 'username_taken') {
Alert.alert( Alert.alert(
'Username taken', UsernameTakenAlertDetails.title,
'An account with that username already exists', UsernameTakenAlertDetails.message,
[{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }], [{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }],
{ cancelable: false }, { cancelable: false },
); );
} else if (e.message === 'client_version_unsupported') { } else if (e.message === 'client_version_unsupported') {
Alert.alert( Alert.alert(
AppOutOfDateAlertDetails.title, AppOutOfDateAlertDetails.title,
AppOutOfDateAlertDetails.message, AppOutOfDateAlertDetails.message,
[{ text: 'OK', onPress: this.onAppOutOfDateAlertAcknowledged }], [{ text: 'OK', onPress: this.onAppOutOfDateAlertAcknowledged }],
▲ Show 20 Lines • Show All 120 Lines • Show Last 20 Lines
View Options

native/avatars/thread-avatar.react.js

Show All 40 Lines
import { TextInput } from './modal-components.react.js'; import { TextInput } from './modal-components.react.js';
import { setNativeCredentials } from './native-credentials.js'; import { setNativeCredentials } from './native-credentials.js';
import { PanelButton, Panel } from './panel-components.react.js'; import { PanelButton, Panel } from './panel-components.react.js';
import SWMansionIcon from '../components/swmansion-icon.react.js'; import SWMansionIcon from '../components/swmansion-icon.react.js';
import { useSelector } from '../redux/redux-utils.js'; import { useSelector } from '../redux/redux-utils.js';
import { nativeLogInExtraInfoSelector } from '../selectors/account-selectors.js'; import { nativeLogInExtraInfoSelector } from '../selectors/account-selectors.js';
import type { KeyPressEvent } from '../types/react-native.js'; import type { KeyPressEvent } from '../types/react-native.js';
import { AppOutOfDateAlertDetails } from '../utils/alert-messages.js'; import {
AppOutOfDateAlertDetails,
UsernameReservedAlertDetails,
UsernameTakenAlertDetails,
} from '../utils/alert-messages.js';
import Alert from '../utils/alert.js'; import Alert from '../utils/alert.js';
import { nativeNotificationsSessionCreator } from '../utils/crypto-utils.js'; import { nativeNotificationsSessionCreator } from '../utils/crypto-utils.js';
import { type StateContainer } from '../utils/state-container.js'; import { type StateContainer } from '../utils/state-container.js';
type WritableRegisterState = { type WritableRegisterState = {
usernameInputText: string, usernameInputText: string,
passwordInputText: string, passwordInputText: string,
confirmPasswordInputText: string, confirmPasswordInputText: string,
▲ Show 20 Lines • Show All 302 Lines • ▼ Show 20 Lines try {
await setNativeCredentials({ await setNativeCredentials({
username: result.currentUserInfo.username, username: result.currentUserInfo.username,
password: this.props.registerState.state.passwordInputText, password: this.props.registerState.state.passwordInputText,
}); });
return result; return result;
} catch (e) { } catch (e) {
if (e.message === 'username_reserved') { if (e.message === 'username_reserved') {
Alert.alert( Alert.alert(
'Username reserved', UsernameReservedAlertDetails.title,
'This username is currently reserved. Please contact support@' + UsernameReservedAlertDetails.message,
'comm.app if you would like to claim this account.',
[{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }], [{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }],
{ cancelable: false }, { cancelable: false },
); );
} else if (e.message === 'username_taken') { } else if (e.message === 'username_taken') {
Alert.alert( Alert.alert(
'Username taken', UsernameTakenAlertDetails.title,
'An account with that username already exists', UsernameTakenAlertDetails.message,
[{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }], [{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }],
{ cancelable: false }, { cancelable: false },
); );
} else if (e.message === 'client_version_unsupported') { } else if (e.message === 'client_version_unsupported') {
Alert.alert( Alert.alert(
AppOutOfDateAlertDetails.title, AppOutOfDateAlertDetails.title,
AppOutOfDateAlertDetails.message, AppOutOfDateAlertDetails.message,
[{ text: 'OK', onPress: this.onAppOutOfDateAlertAcknowledged }], [{ text: 'OK', onPress: this.onAppOutOfDateAlertAcknowledged }],
▲ Show 20 Lines • Show All 120 Lines • Show Last 20 Lines