Skip to content

Commit 8577b07

Browse files
authored
Merge branch 'master' into issue-5900-fix-context-menu-delay-bug
2 parents 3ac1b52 + 27b8b37 commit 8577b07

File tree

5 files changed

+177
-156
lines changed

5 files changed

+177
-156
lines changed

extension/js/common/browser/chrome.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export const storageGetAll = async (storageType: ChromeStorageType): Promise<{ [
6969
void handleFatalErr('storage_undefined', new Error('storage is undefined'));
7070
} else {
7171
const storage = chrome.storage[storageType];
72-
storage.get(resolve);
72+
void storage.get(resolve);
7373
}
7474
});
7575
};

extension/js/common/core/crypto/key.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -526,6 +526,7 @@ export class KeyUtil {
526526
if (decodedChunks.length === 0) return false;
527527

528528
const rawData = decodedChunks.join('');
529+
// eslint-disable-next-line @typescript-eslint/no-misused-spread
529530
const dataBytes = new Uint8Array([...rawData].map(c => c.charCodeAt(0)));
530531

531532
return KeyUtil.crc24(dataBytes) === providedCRC;

extension/js/common/settings.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,10 @@ export class Settings {
9494
if (!filter) {
9595
throw new Error('Filter is empty for account_email"' + acctEmail + '"');
9696
}
97+
9798
await new Promise<void>((resolve, reject) => {
98-
chrome.storage.local.get(async storage => {
99+
// eslint-disable-next-line no-null/no-null
100+
chrome.storage.local.get(null, async storage => {
99101
try {
100102
for (const storageIndex of Object.keys(storage)) {
101103
if (storageIndex.startsWith(filter)) {

0 commit comments

Comments
 (0)