Page MenuHomePhabricator
Differential D7502

[native] Pull `EditAvatarBadge` into its own component
ClosedPublic
Actions

Authored by atul on Apr 18 2023, 1:08 PM.
Tags
None
Referenced Files
Unknown Object (File)
Sun, Mar 2, 7:35 AM
Unknown Object (File)
Sun, Mar 2, 7:35 AM
Unknown Object (File)
Sun, Mar 2, 2:52 AM
Unknown Object (File)
Feb 16 2025, 9:49 PM
Unknown Object (File)
Feb 13 2025, 6:02 PM
Unknown Object (File)
Jan 25 2025, 8:29 AM
Unknown Object (File)
Jan 25 2025, 8:29 AM
Unknown Object (File)
Jan 25 2025, 8:28 AM
View All 72 Files
Subscribers
tomek

Details

Reviewers
ashoat
ginsu
Commits
rCOMM343b90fb639a: [native] Pull `EditAvatarBadge` into its own component
Summary

Pulling out some more that's in common between EditUserAvatar and EditThreadAvatar.

Depends on D7499

Test Plan

Things continue to work and look as expected.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

Diff 25309

View Options

native/avatars/edit-avatar-badge.react.js

// @flow // @flow
import reduceConnectionInfo from './connection-reducer.js';
import { reduceDeviceToken } from './device-token-reducer.js'; import { reduceDeviceToken } from './device-token-reducer.js';
import { unsupervisedBackgroundActionType } from './lifecycle-state-reducer.js'; import { unsupervisedBackgroundActionType } from './lifecycle-state-reducer.js';
import { updateActivityActionTypes } from '../actions/activity-actions.js'; import { updateActivityActionTypes } from '../actions/activity-actions.js';
import { updateLastCommunicatedPlatformDetailsActionType } from '../actions/device-actions.js'; import { updateLastCommunicatedPlatformDetailsActionType } from '../actions/device-actions.js';
import { import {
addKeyserverActionType, addKeyserverActionType,
removeKeyserverActionType, removeKeyserverActionType,
} from '../actions/keyserver-actions.js'; } from '../actions/keyserver-actions.js';
import { siweAuthActionTypes } from '../actions/siwe-actions.js'; import { siweAuthActionTypes } from '../actions/siwe-actions.js';
import { import {
logInActionTypes,
resetUserStateActionType,
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes, deleteAccountActionTypes,
registerActionTypes, registerActionTypes,
logInActionTypes,
resetUserStateActionType,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { queueActivityUpdatesActionType } from '../types/activity-types.js'; import { queueActivityUpdatesActionType } from '../types/activity-types.js';
import type { KeyserverStore } from '../types/keyserver-types'; import type { KeyserverStore } from '../types/keyserver-types';
import type { BaseAction } from '../types/redux-types.js'; import type { BaseAction } from '../types/redux-types.js';
import { import {
fullStateSyncActionType, fullStateSyncActionType,
incrementalStateSyncActionType, incrementalStateSyncActionType,
updateConnectionStatusActionType, updateConnectionStatusActionType,
setLateResponseActionType,
updateDisconnectedBarActionType,
} from '../types/socket-types.js'; } from '../types/socket-types.js';
import { processUpdatesActionType } from '../types/update-types.js'; import { processUpdatesActionType } from '../types/update-types.js';
import { setNewSessionActionType } from '../utils/action-utils.js'; import { setNewSessionActionType } from '../utils/action-utils.js';
import { getConfig } from '../utils/config.js'; import { getConfig } from '../utils/config.js';
import { setURLPrefix } from '../utils/url-utils.js'; import { setURLPrefix } from '../utils/url-utils.js';
import { ashoatKeyserverID } from '../utils/validation-utils.js'; import { ashoatKeyserverID } from '../utils/validation-utils.js';
export default function reduceKeyserverStore( export default function reduceKeyserverStore(
state: KeyserverStore, state: KeyserverStore,
action: BaseAction, action: BaseAction,
): KeyserverStore { ): KeyserverStore {
if ( if (action.type === addKeyserverActionType) {
action.type === logOutActionTypes.success ||
action.type === deleteAccountActionTypes.success
) {
state = {
keyserverInfos: {
[ashoatKeyserverID]: {
...state.keyserverInfos[ashoatKeyserverID],
},
},
};
} else if (action.type === addKeyserverActionType) {
return { return {
...state, ...state,
keyserverInfos: { keyserverInfos: {
...state.keyserverInfos, ...state.keyserverInfos,
[action.payload.keyserverAdminUserID]: { [action.payload.keyserverAdminUserID]: {
...action.payload.newKeyserverInfo, ...action.payload.newKeyserverInfo,
}, },
}, },
Show All 31 Lines if (action.payload.sessionChange.cookie !== undefined) {
...state.keyserverInfos, ...state.keyserverInfos,
[keyserverID]: { [keyserverID]: {
...state.keyserverInfos[keyserverID], ...state.keyserverInfos[keyserverID],
cookie: action.payload.sessionChange.cookie, cookie: action.payload.sessionChange.cookie,
}, },
}, },
}; };
} }
if (action.payload.sessionChange.cookieInvalidated) {
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
queuedActivityUpdates: [],
},
},
},
};
}
} else if ( } else if (
action.type === logInActionTypes.success || action.type === logInActionTypes.success ||
action.type === siweAuthActionTypes.success action.type === siweAuthActionTypes.success
) { ) {
const { updatesCurrentAsOf } = action.payload; const { updatesCurrentAsOf } = action.payload;
for (const keyserverID in updatesCurrentAsOf) { for (const keyserverID in updatesCurrentAsOf) {
state = { state = {
...state, ...state,
▲ Show 20 Lines • Show All 163 Lines • ▼ Show 20 Lines for (const keyserverID in activityUpdates) {
connection: { ...oldConnection, queuedActivityUpdates }, connection: { ...oldConnection, queuedActivityUpdates },
}, },
}; };
} }
state = { state = {
...state, ...state,
keyserverInfos, keyserverInfos,
}; };
} } else if (
action.type === logOutActionTypes.success ||
action.type === deleteAccountActionTypes.success
) {
// We want to remove all keyservers but Ashoat's keyserver
const oldConnection = state.keyserverInfos[ashoatKeyserverID].connection;
const connection = reduceConnectionInfo( const keyserverInfos = {
state.keyserverInfos[ashoatKeyserverID].connection, [ashoatKeyserverID]: {
action, ...state.keyserverInfos[ashoatKeyserverID],
connection: { ...oldConnection, queuedActivityUpdates: [] },
},
};
state = {
...state,
keyserverInfos,
};
} else if (action.type === setLateResponseActionType) {
const { messageID, isLate, keyserverID } = action.payload;
const lateResponsesSet = new Set<number>(
state.keyserverInfos[keyserverID].connection.lateResponses,
); );
if (isLate) {
lateResponsesSet.add(messageID);
} else {
lateResponsesSet.delete(messageID);
}
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
lateResponses: [...lateResponsesSet],
},
},
},
};
} else if (action.type === updateDisconnectedBarActionType) {
const { keyserverID } = action.payload;
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
showDisconnectedBar: action.payload.visible,
},
},
},
};
}
const deviceToken = reduceDeviceToken( const deviceToken = reduceDeviceToken(
state.keyserverInfos[ashoatKeyserverID].deviceToken, state.keyserverInfos[ashoatKeyserverID].deviceToken,
action, action,
); );
if ( if (deviceToken !== state.keyserverInfos[ashoatKeyserverID].deviceToken) {
connection !== state.keyserverInfos[ashoatKeyserverID].connection ||
deviceToken !== state.keyserverInfos[ashoatKeyserverID].deviceToken
) {
state = { state = {
...state, ...state,
keyserverInfos: { keyserverInfos: {
...state.keyserverInfos, ...state.keyserverInfos,
[ashoatKeyserverID]: { [ashoatKeyserverID]: {
...state.keyserverInfos[ashoatKeyserverID], ...state.keyserverInfos[ashoatKeyserverID],
connection,
deviceToken, deviceToken,
}, },
}, },
}; };
} }
return state; return state;
} }
View Options

native/avatars/edit-thread-avatar.react.js

// @flow // @flow
import reduceConnectionInfo from './connection-reducer.js';
import { reduceDeviceToken } from './device-token-reducer.js'; import { reduceDeviceToken } from './device-token-reducer.js';
import { unsupervisedBackgroundActionType } from './lifecycle-state-reducer.js'; import { unsupervisedBackgroundActionType } from './lifecycle-state-reducer.js';
import { updateActivityActionTypes } from '../actions/activity-actions.js'; import { updateActivityActionTypes } from '../actions/activity-actions.js';
import { updateLastCommunicatedPlatformDetailsActionType } from '../actions/device-actions.js'; import { updateLastCommunicatedPlatformDetailsActionType } from '../actions/device-actions.js';
import { import {
addKeyserverActionType, addKeyserverActionType,
removeKeyserverActionType, removeKeyserverActionType,
} from '../actions/keyserver-actions.js'; } from '../actions/keyserver-actions.js';
import { siweAuthActionTypes } from '../actions/siwe-actions.js'; import { siweAuthActionTypes } from '../actions/siwe-actions.js';
import { import {
logInActionTypes,
resetUserStateActionType,
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes, deleteAccountActionTypes,
registerActionTypes, registerActionTypes,
logInActionTypes,
resetUserStateActionType,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { queueActivityUpdatesActionType } from '../types/activity-types.js'; import { queueActivityUpdatesActionType } from '../types/activity-types.js';
import type { KeyserverStore } from '../types/keyserver-types'; import type { KeyserverStore } from '../types/keyserver-types';
import type { BaseAction } from '../types/redux-types.js'; import type { BaseAction } from '../types/redux-types.js';
import { import {
fullStateSyncActionType, fullStateSyncActionType,
incrementalStateSyncActionType, incrementalStateSyncActionType,
updateConnectionStatusActionType, updateConnectionStatusActionType,
setLateResponseActionType,
updateDisconnectedBarActionType,
} from '../types/socket-types.js'; } from '../types/socket-types.js';
import { processUpdatesActionType } from '../types/update-types.js'; import { processUpdatesActionType } from '../types/update-types.js';
import { setNewSessionActionType } from '../utils/action-utils.js'; import { setNewSessionActionType } from '../utils/action-utils.js';
import { getConfig } from '../utils/config.js'; import { getConfig } from '../utils/config.js';
import { setURLPrefix } from '../utils/url-utils.js'; import { setURLPrefix } from '../utils/url-utils.js';
import { ashoatKeyserverID } from '../utils/validation-utils.js'; import { ashoatKeyserverID } from '../utils/validation-utils.js';
export default function reduceKeyserverStore( export default function reduceKeyserverStore(
state: KeyserverStore, state: KeyserverStore,
action: BaseAction, action: BaseAction,
): KeyserverStore { ): KeyserverStore {
if ( if (action.type === addKeyserverActionType) {
action.type === logOutActionTypes.success ||
action.type === deleteAccountActionTypes.success
) {
state = {
keyserverInfos: {
[ashoatKeyserverID]: {
...state.keyserverInfos[ashoatKeyserverID],
},
},
};
} else if (action.type === addKeyserverActionType) {
return { return {
...state, ...state,
keyserverInfos: { keyserverInfos: {
...state.keyserverInfos, ...state.keyserverInfos,
[action.payload.keyserverAdminUserID]: { [action.payload.keyserverAdminUserID]: {
...action.payload.newKeyserverInfo, ...action.payload.newKeyserverInfo,
}, },
}, },
Show All 31 Lines if (action.payload.sessionChange.cookie !== undefined) {
...state.keyserverInfos, ...state.keyserverInfos,
[keyserverID]: { [keyserverID]: {
...state.keyserverInfos[keyserverID], ...state.keyserverInfos[keyserverID],
cookie: action.payload.sessionChange.cookie, cookie: action.payload.sessionChange.cookie,
}, },
}, },
}; };
} }
if (action.payload.sessionChange.cookieInvalidated) {
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
queuedActivityUpdates: [],
},
},
},
};
}
} else if ( } else if (
action.type === logInActionTypes.success || action.type === logInActionTypes.success ||
action.type === siweAuthActionTypes.success action.type === siweAuthActionTypes.success
) { ) {
const { updatesCurrentAsOf } = action.payload; const { updatesCurrentAsOf } = action.payload;
for (const keyserverID in updatesCurrentAsOf) { for (const keyserverID in updatesCurrentAsOf) {
state = { state = {
...state, ...state,
▲ Show 20 Lines • Show All 163 Lines • ▼ Show 20 Lines for (const keyserverID in activityUpdates) {
connection: { ...oldConnection, queuedActivityUpdates }, connection: { ...oldConnection, queuedActivityUpdates },
}, },
}; };
} }
state = { state = {
...state, ...state,
keyserverInfos, keyserverInfos,
}; };
} } else if (
action.type === logOutActionTypes.success ||
action.type === deleteAccountActionTypes.success
) {
// We want to remove all keyservers but Ashoat's keyserver
const oldConnection = state.keyserverInfos[ashoatKeyserverID].connection;
const connection = reduceConnectionInfo( const keyserverInfos = {
state.keyserverInfos[ashoatKeyserverID].connection, [ashoatKeyserverID]: {
action, ...state.keyserverInfos[ashoatKeyserverID],
connection: { ...oldConnection, queuedActivityUpdates: [] },
},
};
state = {
...state,
keyserverInfos,
};
} else if (action.type === setLateResponseActionType) {
const { messageID, isLate, keyserverID } = action.payload;
const lateResponsesSet = new Set<number>(
state.keyserverInfos[keyserverID].connection.lateResponses,
); );
if (isLate) {
lateResponsesSet.add(messageID);
} else {
lateResponsesSet.delete(messageID);
}
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
lateResponses: [...lateResponsesSet],
},
},
},
};
} else if (action.type === updateDisconnectedBarActionType) {
const { keyserverID } = action.payload;
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
showDisconnectedBar: action.payload.visible,
},
},
},
};
}
const deviceToken = reduceDeviceToken( const deviceToken = reduceDeviceToken(
state.keyserverInfos[ashoatKeyserverID].deviceToken, state.keyserverInfos[ashoatKeyserverID].deviceToken,
action, action,
); );
if ( if (deviceToken !== state.keyserverInfos[ashoatKeyserverID].deviceToken) {
connection !== state.keyserverInfos[ashoatKeyserverID].connection ||
deviceToken !== state.keyserverInfos[ashoatKeyserverID].deviceToken
) {
state = { state = {
...state, ...state,
keyserverInfos: { keyserverInfos: {
...state.keyserverInfos, ...state.keyserverInfos,
[ashoatKeyserverID]: { [ashoatKeyserverID]: {
...state.keyserverInfos[ashoatKeyserverID], ...state.keyserverInfos[ashoatKeyserverID],
connection,
deviceToken, deviceToken,
}, },
}, },
}; };
} }
return state; return state;
} }
View Options

native/avatars/edit-user-avatar.react.js

// @flow // @flow
import reduceConnectionInfo from './connection-reducer.js';
import { reduceDeviceToken } from './device-token-reducer.js'; import { reduceDeviceToken } from './device-token-reducer.js';
import { unsupervisedBackgroundActionType } from './lifecycle-state-reducer.js'; import { unsupervisedBackgroundActionType } from './lifecycle-state-reducer.js';
import { updateActivityActionTypes } from '../actions/activity-actions.js'; import { updateActivityActionTypes } from '../actions/activity-actions.js';
import { updateLastCommunicatedPlatformDetailsActionType } from '../actions/device-actions.js'; import { updateLastCommunicatedPlatformDetailsActionType } from '../actions/device-actions.js';
import { import {
addKeyserverActionType, addKeyserverActionType,
removeKeyserverActionType, removeKeyserverActionType,
} from '../actions/keyserver-actions.js'; } from '../actions/keyserver-actions.js';
import { siweAuthActionTypes } from '../actions/siwe-actions.js'; import { siweAuthActionTypes } from '../actions/siwe-actions.js';
import { import {
logInActionTypes,
resetUserStateActionType,
logOutActionTypes, logOutActionTypes,
deleteAccountActionTypes, deleteAccountActionTypes,
registerActionTypes, registerActionTypes,
logInActionTypes,
resetUserStateActionType,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { queueActivityUpdatesActionType } from '../types/activity-types.js'; import { queueActivityUpdatesActionType } from '../types/activity-types.js';
import type { KeyserverStore } from '../types/keyserver-types'; import type { KeyserverStore } from '../types/keyserver-types';
import type { BaseAction } from '../types/redux-types.js'; import type { BaseAction } from '../types/redux-types.js';
import { import {
fullStateSyncActionType, fullStateSyncActionType,
incrementalStateSyncActionType, incrementalStateSyncActionType,
updateConnectionStatusActionType, updateConnectionStatusActionType,
setLateResponseActionType,
updateDisconnectedBarActionType,
} from '../types/socket-types.js'; } from '../types/socket-types.js';
import { processUpdatesActionType } from '../types/update-types.js'; import { processUpdatesActionType } from '../types/update-types.js';
import { setNewSessionActionType } from '../utils/action-utils.js'; import { setNewSessionActionType } from '../utils/action-utils.js';
import { getConfig } from '../utils/config.js'; import { getConfig } from '../utils/config.js';
import { setURLPrefix } from '../utils/url-utils.js'; import { setURLPrefix } from '../utils/url-utils.js';
import { ashoatKeyserverID } from '../utils/validation-utils.js'; import { ashoatKeyserverID } from '../utils/validation-utils.js';
export default function reduceKeyserverStore( export default function reduceKeyserverStore(
state: KeyserverStore, state: KeyserverStore,
action: BaseAction, action: BaseAction,
): KeyserverStore { ): KeyserverStore {
if ( if (action.type === addKeyserverActionType) {
action.type === logOutActionTypes.success ||
action.type === deleteAccountActionTypes.success
) {
state = {
keyserverInfos: {
[ashoatKeyserverID]: {
...state.keyserverInfos[ashoatKeyserverID],
},
},
};
} else if (action.type === addKeyserverActionType) {
return { return {
...state, ...state,
keyserverInfos: { keyserverInfos: {
...state.keyserverInfos, ...state.keyserverInfos,
[action.payload.keyserverAdminUserID]: { [action.payload.keyserverAdminUserID]: {
...action.payload.newKeyserverInfo, ...action.payload.newKeyserverInfo,
}, },
}, },
Show All 31 Lines if (action.payload.sessionChange.cookie !== undefined) {
...state.keyserverInfos, ...state.keyserverInfos,
[keyserverID]: { [keyserverID]: {
...state.keyserverInfos[keyserverID], ...state.keyserverInfos[keyserverID],
cookie: action.payload.sessionChange.cookie, cookie: action.payload.sessionChange.cookie,
}, },
}, },
}; };
} }
if (action.payload.sessionChange.cookieInvalidated) {
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
queuedActivityUpdates: [],
},
},
},
};
}
} else if ( } else if (
action.type === logInActionTypes.success || action.type === logInActionTypes.success ||
action.type === siweAuthActionTypes.success action.type === siweAuthActionTypes.success
) { ) {
const { updatesCurrentAsOf } = action.payload; const { updatesCurrentAsOf } = action.payload;
for (const keyserverID in updatesCurrentAsOf) { for (const keyserverID in updatesCurrentAsOf) {
state = { state = {
...state, ...state,
▲ Show 20 Lines • Show All 163 Lines • ▼ Show 20 Lines for (const keyserverID in activityUpdates) {
connection: { ...oldConnection, queuedActivityUpdates }, connection: { ...oldConnection, queuedActivityUpdates },
}, },
}; };
} }
state = { state = {
...state, ...state,
keyserverInfos, keyserverInfos,
}; };
} } else if (
action.type === logOutActionTypes.success ||
action.type === deleteAccountActionTypes.success
) {
// We want to remove all keyservers but Ashoat's keyserver
const oldConnection = state.keyserverInfos[ashoatKeyserverID].connection;
const connection = reduceConnectionInfo( const keyserverInfos = {
state.keyserverInfos[ashoatKeyserverID].connection, [ashoatKeyserverID]: {
action, ...state.keyserverInfos[ashoatKeyserverID],
connection: { ...oldConnection, queuedActivityUpdates: [] },
},
};
state = {
...state,
keyserverInfos,
};
} else if (action.type === setLateResponseActionType) {
const { messageID, isLate, keyserverID } = action.payload;
const lateResponsesSet = new Set<number>(
state.keyserverInfos[keyserverID].connection.lateResponses,
); );
if (isLate) {
lateResponsesSet.add(messageID);
} else {
lateResponsesSet.delete(messageID);
}
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
lateResponses: [...lateResponsesSet],
},
},
},
};
} else if (action.type === updateDisconnectedBarActionType) {
const { keyserverID } = action.payload;
state = {
...state,
keyserverInfos: {
...state.keyserverInfos,
[keyserverID]: {
...state.keyserverInfos[keyserverID],
connection: {
...state.keyserverInfos[keyserverID].connection,
showDisconnectedBar: action.payload.visible,
},
},
},
};
}
const deviceToken = reduceDeviceToken( const deviceToken = reduceDeviceToken(
state.keyserverInfos[ashoatKeyserverID].deviceToken, state.keyserverInfos[ashoatKeyserverID].deviceToken,
action, action,
); );
if ( if (deviceToken !== state.keyserverInfos[ashoatKeyserverID].deviceToken) {
connection !== state.keyserverInfos[ashoatKeyserverID].connection ||
deviceToken !== state.keyserverInfos[ashoatKeyserverID].deviceToken
) {
state = { state = {
...state, ...state,
keyserverInfos: { keyserverInfos: {
...state.keyserverInfos, ...state.keyserverInfos,
[ashoatKeyserverID]: { [ashoatKeyserverID]: {
...state.keyserverInfos[ashoatKeyserverID], ...state.keyserverInfos[ashoatKeyserverID],
connection,
deviceToken, deviceToken,
}, },
}, },
}; };
} }
return state; return state;
} }