Page MenuHomePhabricator
Differential D3448

[web] Remove `div.bottomContainer` from `Splash`
ClosedPublic
Actions

Authored by atul on Mar 16 2022, 3:09 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Apr 1, 9:33 PM
Unknown Object (File)
Tue, Apr 1, 5:30 AM
Unknown Object (File)
Mon, Mar 31, 10:16 AM
Unknown Object (File)
Mon, Mar 31, 4:34 AM
Unknown Object (File)
Sun, Mar 30, 6:13 AM
Unknown Object (File)
Fri, Mar 28, 7:02 AM
Unknown Object (File)
Fri, Mar 28, 7:02 AM
Unknown Object (File)
Fri, Mar 28, 7:02 AM
View All Files
Subscribers
• adrian
• karol

Details

Reviewers
• jacek
tomek
• benschac
varun
Commits
rCOMM85f151280180: [web] Remove `div.bottomContainer` from `Splash`
Summary

Cut div.bottomContainer in splash.react.js and associated styles in splash.css.

Here's how it looks:

6918.png (1×3 px, 582 KB)

depends on D3447

Test Plan

Same as D3447 (tldr: make sure we can still log in, etc)

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

atul created this revision.Mar 16 2022, 3:09 PM
Herald added subscribers: • karol, • adrian. · View Herald TranscriptMar 16 2022, 3:09 PM
atul published this revision for review.Mar 16 2022, 3:10 PM
atul edited the summary of this revision. (Show Details)
Harbormaster completed remote builds in B7434: Diff 10464.Mar 16 2022, 3:15 PM
• benschac added a comment.Mar 16 2022, 5:43 PM

Should all of these diffs relating to the splash page be in a linked stack on phabricator? Looks good otherwise.

• benschac accepted this revision.Mar 16 2022, 5:43 PM
This revision is now accepted and ready to land.Mar 16 2022, 5:43 PM
atul edited the summary of this revision. (Show Details)Mar 16 2022, 9:11 PM
atul added a parent revision: D3447: [web] Remove "Request Access" markup/styling from `Splash` component.
atul added a child revision: D3449: [web] Remove `div.content` from `Splash`.
atul added a comment.Mar 16 2022, 9:14 PM
In D3448#93619, @benschac wrote:

Should all of these diffs relating to the splash page be in a linked stack on phabricator? Looks good otherwise.

yeah thanks for catching, meant to do all the "depends on" stuff at the end.. but then forgot

atul added 1 blocking reviewer(s): tomek.Mar 16 2022, 9:47 PM
This revision now requires review to proceed.Mar 16 2022, 9:47 PM
atul changed 2 blocking reviewer(s), added 1: ashoat; removed 1: tomek.Mar 17 2022, 8:12 AM
tomek accepted this revision.Mar 17 2022, 10:40 AM
atul removed a reviewer: ashoat.Mar 17 2022, 10:59 AM
This revision is now accepted and ready to land.Mar 17 2022, 10:59 AM
atul updated this revision to Diff 10484.Mar 17 2022, 11:02 AM

rebase before landing

This revision was landed with ongoing or failed builds.Mar 17 2022, 11:02 AM
Closed by commit rCOMM85f151280180: [web] Remove `div.bottomContainer` from `Splash` (authored by atul). · Explain Why
This revision was automatically updated to reflect the committed changes.
atul added a commit: rCOMM85f151280180: [web] Remove `div.bottomContainer` from `Splash`.
Harbormaster failed remote builds in B7446: Diff 10484!Mar 17 2022, 11:03 AM

Revision Contents
Changeset List

PathSize
web/
splash/
42 lines
16 lines

Diff 10485

View Options

web/splash/splash.css

Show First 20 Lines • Show All 1,023 Lines • ▼ Show 20 Lines): ReduceMessageStoreResult {
) { ) {
const payload = ensureRealizedThreadIDIsUsedWhenPossible( const payload = ensureRealizedThreadIDIsUsedWhenPossible(
action.payload, action.payload,
newThreadInfos, newThreadInfos,
); );
const { localID, threadID } = payload; const { localID, threadID } = payload;
invariant(localID, `localID should be set on ${action.type}`); invariant(localID, `localID should be set on ${action.type}`);
const messageIDs = messageStore.threads[threadID]?.messageIDs ?? [];
if (!messageStore.messages[localID]) {
for (const existingMessageID of messageIDs) {
const existingMessageInfo = messageStore.messages[existingMessageID];
if (existingMessageInfo && existingMessageInfo.localID === localID) {
return { messageStoreOperations: [], messageStore };
}
}
}
const messageStoreOperations = [ const messageStoreOperations = [
{ {
type: 'replace', type: 'replace',
payload: { id: localID, messageInfo: payload }, payload: { id: localID, messageInfo: payload },
}, },
]; ];
const processedMessageStore = processMessageStoreOperations(
messageStore,
messageStoreOperations,
);
const now = Date.now(); const now = Date.now();
const messageIDs = messageStore.threads[threadID]?.messageIDs ?? []; let updatedThreads;
let local = { ...messageStore.local };
if (messageStore.messages[localID]) { if (messageStore.messages[localID]) {
const messages = { ...messageStore.messages, [localID]: payload }; const messages = { ...messageStore.messages, [localID]: payload };
const local = _pickBy( local = _pickBy(
(localInfo: LocalMessageInfo, key: string) => key !== localID, (localInfo: LocalMessageInfo, key: string) => key !== localID,
)(messageStore.local); )(messageStore.local);
const thread = messageStore.threads[threadID]; const thread = messageStore.threads[threadID];
const threads = { updatedThreads = {
...messageStore.threads,
[threadID]: { [threadID]: {
messageIDs: sortMessageIDs(messages)(messageIDs), messageIDs: sortMessageIDs(messages)(messageIDs),
startReached: thread?.startReached ?? true, startReached: thread?.startReached ?? true,
lastNavigatedTo: thread?.lastNavigatedTo ?? now, lastNavigatedTo: thread?.lastNavigatedTo ?? now,
lastPruned: thread?.lastPruned ?? now, lastPruned: thread?.lastPruned ?? now,
}, },
}; };
return { } else {
messageStoreOperations, updatedThreads = {
messageStore: { [threadID]: messageStore.threads[threadID]
...messageStore,
messages: processedMessageStore.messages,
threads,
local,
},
};
}
for (const existingMessageID of messageIDs) {
const existingMessageInfo = messageStore.messages[existingMessageID];
if (existingMessageInfo && existingMessageInfo.localID === localID) {
return { messageStoreOperations: [], messageStore };
}
}
const threadState: ThreadMessageInfo = messageStore.threads[threadID]
? { ? {
...messageStore.threads[threadID], ...messageStore.threads[threadID],
messageIDs: [localID, ...messageIDs], messageIDs: [localID, ...messageIDs],
} }
: { : {
messageIDs: [localID], messageIDs: [localID],
startReached: true, startReached: true,
lastNavigatedTo: now, lastNavigatedTo: now,
lastPruned: now, lastPruned: now,
},
}; };
}
return { const threads = {
messageStoreOperations,
messageStore: {
messages: processedMessageStore.messages,
threads: {
...messageStore.threads, ...messageStore.threads,
[threadID]: threadState, ...updatedThreads,
};
messageStoreOperations.push({
type: 'replace_threads',
payload: {
threads: { ...updatedThreads },
}, },
local: messageStore.local, });
const processedMessageStore = processMessageStoreOperations(
messageStore,
messageStoreOperations,
);
const newMessageStore = {
messages: processedMessageStore.messages,
threads,
local,
currentAsOf: messageStore.currentAsOf, currentAsOf: messageStore.currentAsOf,
}, };
assertMessageStoreThreadsAreEqual(
processedMessageStore,
newMessageStore,
action.type,
);
return {
messageStoreOperations,
messageStore: newMessageStore,
}; };
} else if ( } else if (
action.type === sendTextMessageActionTypes.failed || action.type === sendTextMessageActionTypes.failed ||
action.type === sendMultimediaMessageActionTypes.failed action.type === sendMultimediaMessageActionTypes.failed
) { ) {
const { localID } = action.payload; const { localID } = action.payload;
return { return {
messageStoreOperations: [], messageStoreOperations: [],
▲ Show 20 Lines • Show All 565 Lines • Show Last 20 Lines
View Options

web/splash/splash.react.js

Show First 20 Lines • Show All 1,023 Lines • ▼ Show 20 Lines): ReduceMessageStoreResult {
) { ) {
const payload = ensureRealizedThreadIDIsUsedWhenPossible( const payload = ensureRealizedThreadIDIsUsedWhenPossible(
action.payload, action.payload,
newThreadInfos, newThreadInfos,
); );
const { localID, threadID } = payload; const { localID, threadID } = payload;
invariant(localID, `localID should be set on ${action.type}`); invariant(localID, `localID should be set on ${action.type}`);
const messageIDs = messageStore.threads[threadID]?.messageIDs ?? [];
if (!messageStore.messages[localID]) {
for (const existingMessageID of messageIDs) {
const existingMessageInfo = messageStore.messages[existingMessageID];
if (existingMessageInfo && existingMessageInfo.localID === localID) {
return { messageStoreOperations: [], messageStore };
}
}
}
const messageStoreOperations = [ const messageStoreOperations = [
{ {
type: 'replace', type: 'replace',
payload: { id: localID, messageInfo: payload }, payload: { id: localID, messageInfo: payload },
}, },
]; ];
const processedMessageStore = processMessageStoreOperations(
messageStore,
messageStoreOperations,
);
const now = Date.now(); const now = Date.now();
const messageIDs = messageStore.threads[threadID]?.messageIDs ?? []; let updatedThreads;
let local = { ...messageStore.local };
if (messageStore.messages[localID]) { if (messageStore.messages[localID]) {
const messages = { ...messageStore.messages, [localID]: payload }; const messages = { ...messageStore.messages, [localID]: payload };
const local = _pickBy( local = _pickBy(
(localInfo: LocalMessageInfo, key: string) => key !== localID, (localInfo: LocalMessageInfo, key: string) => key !== localID,
)(messageStore.local); )(messageStore.local);
const thread = messageStore.threads[threadID]; const thread = messageStore.threads[threadID];
const threads = { updatedThreads = {
...messageStore.threads,
[threadID]: { [threadID]: {
messageIDs: sortMessageIDs(messages)(messageIDs), messageIDs: sortMessageIDs(messages)(messageIDs),
startReached: thread?.startReached ?? true, startReached: thread?.startReached ?? true,
lastNavigatedTo: thread?.lastNavigatedTo ?? now, lastNavigatedTo: thread?.lastNavigatedTo ?? now,
lastPruned: thread?.lastPruned ?? now, lastPruned: thread?.lastPruned ?? now,
}, },
}; };
return { } else {
messageStoreOperations, updatedThreads = {
messageStore: { [threadID]: messageStore.threads[threadID]
...messageStore,
messages: processedMessageStore.messages,
threads,
local,
},
};
}
for (const existingMessageID of messageIDs) {
const existingMessageInfo = messageStore.messages[existingMessageID];
if (existingMessageInfo && existingMessageInfo.localID === localID) {
return { messageStoreOperations: [], messageStore };
}
}
const threadState: ThreadMessageInfo = messageStore.threads[threadID]
? { ? {
...messageStore.threads[threadID], ...messageStore.threads[threadID],
messageIDs: [localID, ...messageIDs], messageIDs: [localID, ...messageIDs],
} }
: { : {
messageIDs: [localID], messageIDs: [localID],
startReached: true, startReached: true,
lastNavigatedTo: now, lastNavigatedTo: now,
lastPruned: now, lastPruned: now,
},
}; };
}
return { const threads = {
messageStoreOperations,
messageStore: {
messages: processedMessageStore.messages,
threads: {
...messageStore.threads, ...messageStore.threads,
[threadID]: threadState, ...updatedThreads,
};
messageStoreOperations.push({
type: 'replace_threads',
payload: {
threads: { ...updatedThreads },
}, },
local: messageStore.local, });
const processedMessageStore = processMessageStoreOperations(
messageStore,
messageStoreOperations,
);
const newMessageStore = {
messages: processedMessageStore.messages,
threads,
local,
currentAsOf: messageStore.currentAsOf, currentAsOf: messageStore.currentAsOf,
}, };
assertMessageStoreThreadsAreEqual(
processedMessageStore,
newMessageStore,
action.type,
);
return {
messageStoreOperations,
messageStore: newMessageStore,
}; };
} else if ( } else if (
action.type === sendTextMessageActionTypes.failed || action.type === sendTextMessageActionTypes.failed ||
action.type === sendMultimediaMessageActionTypes.failed action.type === sendMultimediaMessageActionTypes.failed
) { ) {
const { localID } = action.payload; const { localID } = action.payload;
return { return {
messageStoreOperations: [], messageStoreOperations: [],
▲ Show 20 Lines • Show All 565 Lines • Show Last 20 Lines