chore: address PR comments

pull/3281/head
Audric Ackermann 3 months ago
parent 74cceb2498
commit 9c969d1e83
No known key found for this signature in database

@ -247,12 +247,14 @@ const ResendButton = ({ groupPk, pubkey }: { pubkey: PubkeyType; groupPk: GroupP
if (!shouldShowResendButton) {
return null;
}
const resendButtonDisabled =
memberStatus === 'INVITE_SENDING' ||
memberStatus === 'PROMOTION_SENDING' ||
memberStatus === 'REMOVED_MEMBER' ||
memberStatus === 'REMOVED_MEMBER_AND_MESSAGES' ||
memberStatus === 'REMOVED_UNKNOWN';
return (
<SessionButton
dataTestId={'resend-invite-button'}

@ -248,7 +248,7 @@ export class PersistedJobRunner<T extends TypeOfPersistedData> {
private async addJobUnchecked(job: PersistedJob<T>) {
this.jobsScheduled.push(cloneDeep(job));
this.sortJobsList(); // keeping this here as it is not await (and await)
this.sortJobsList();
await this.writeJobsToDB();
// a job has been added, let's check if we should/can run it now
this.planNextJobs();

@ -250,9 +250,7 @@ class GroupInviteJob extends PersistedJob<GroupInvitePersistedData> {
10 * DURATION.SECONDS,
controller
);
window.log.debug(
`GroupInvite: sendSingleMessage took ${Date.now() - start}ms. effectiveTimestamp: ${effectiveTimestamp}`
);
if (effectiveTimestamp !== null) {
failed = false;

@ -157,7 +157,6 @@ describe('OnionPaths', () => {
});
it('throws if we cannot find a valid edge snode', async () => {
TestUtils.stubWindowLog();
const badPool = generateFakeSnodes(0).map(m => {
return { ...m, storage_server_version: [2, 1, 1] };
});

@ -242,7 +242,6 @@ describe('JobRunner SINGLE', () => {
});
it('does await if there are jobs and at least one is running', async () => {
TestUtils.stubWindowLog();
await runner.loadJobsFromDb();
clock.tick(100);
const job = getFakeSleepForJob(150);

@ -42,6 +42,10 @@ const primaryRed = '#FF9C8E';
const dangerLight = '#E12D19';
const dangerDark = '#FF3A3A';
// Warning
const warningLight = '#A64B00';
const warningDark = '#FCB159';
// Disabled
const disabledLight = '#6D6D6D';
const disabledDark = '#A1A2A1';
@ -135,7 +139,7 @@ type Themes = Record<ThemeNames, ThemeColors>;
// Classic Light
const classicLightPrimary = primaryGreen;
const classicLightDanger = dangerLight;
const classicLightWarning = '#A64B00';
const classicLightWarning = warningLight;
const classicLightDisabled = disabledLight;
const classicLight0 = '#000000';
const classicLight1 = '#6D6D6D';
@ -148,7 +152,7 @@ const classicLight6 = '#FFFFFF';
// Classic Dark
const classicDarkPrimary = primaryGreen;
const classicDarkDanger = dangerDark;
const classicDarkWarning = '#FCB159';
const classicDarkWarning = warningDark;
const classicDarkDisabled = disabledDark;
const classicDark0 = '#000000';
const classicDark1 = '#1B1B1B';
@ -161,7 +165,7 @@ const classicDark6 = '#FFFFFF';
// Ocean Light
const oceanLightPrimary = primaryBlue;
const oceanLightDanger = dangerLight;
const oceanLightWarning = '#A64B00';
const oceanLightWarning = warningLight;
const oceanLightDisabled = disabledLight;
const oceanLight0 = '#000000';
const oceanLight1 = '#19345D';
@ -175,7 +179,7 @@ const oceanLight7 = '#FCFFFF';
// Ocean Dark
const oceanDarkPrimary = primaryBlue;
const oceanDarkDanger = dangerDark;
const oceanDarkWarning = '#FCB159';
const oceanDarkWarning = warningDark;
const oceanDarkDisabled = disabledDark;
const oceanDark0 = '#000000';
const oceanDark1 = '#1A1C28';

Loading…
Cancel
Save